Skip to content

Commit

Permalink
dde_linux: Move symbolic header-file links of Intel driver
Browse files Browse the repository at this point in the history
Because Linux sometimes uses relative includes, the links are moved to the
'include/include/include' directory.

Ref genodelabs#1764
  • Loading branch information
ssumpf authored and chelmuth committed Nov 29, 2015
1 parent d65beb9 commit 020758a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
2 changes: 1 addition & 1 deletion repos/dde_linux/lib/import/import-intel_fb_include.mk
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ INC_DIR += $(SRC_DIR)/include \
$(LX_CONTRIB_DIR)/drivers/gpu/include \
$(LX_CONTRIB_DIR)/include \
$(LX_CONTRIB_DIR)/include/uapi \
$(LIB_CACHE_DIR)/intel_fb_include
$(LIB_CACHE_DIR)/intel_fb_include/include/include/include

CC_OPT += -U__linux__ -D__KERNEL__
CC_OPT += -DCONFIG_DRM_I915_KMS -DCONFIG_I2C -DCONFIG_I2C_BOARDINFO
11 changes: 11 additions & 0 deletions repos/dde_linux/lib/mk/intel_fb_include.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,25 @@
# provides our emulation of the Linux kernel API.
#

ifeq ($(called_from_lib_mk),yes)

LX_CONTRIB_DIR := $(call select_from_ports,dde_linux)/src/drivers/framebuffer/intel
LX_EMUL_H := $(REP_DIR)/src/drivers/framebuffer/intel/include/lx_emul.h

GEN_INCLUDES := $(shell grep -rh "^\#include .*\/" $(LX_CONTRIB_DIR) |\
sed "s/^\#include [^<\"]*[<\"]\([^>\"]*\)[>\"].*/\1/" | sort | uniq)

#
# Put Linux headers in 'GEN_INC' dir, since some include use "../../" paths use
# three level include hierarchy
#
GEN_INC := $(shell pwd)/include/include/include
GEN_INCLUDES := $(addprefix $(GEN_INC)/,$(GEN_INCLUDES))

all: $(GEN_INCLUDES)

$(GEN_INCLUDES):
$(VERBOSE)mkdir -p $(dir $@)
$(VERBOSE)ln -sf $(LX_EMUL_H) $@

endif

0 comments on commit 020758a

Please sign in to comment.