From 020758a2f18bdd1e72df88820ca7ec850fd5d7d7 Mon Sep 17 00:00:00 2001 From: Sebastian Sumpf Date: Mon, 9 Nov 2015 13:50:56 +0100 Subject: [PATCH] dde_linux: Move symbolic header-file links of Intel driver Because Linux sometimes uses relative includes, the links are moved to the 'include/include/include' directory. Ref #1764 --- repos/dde_linux/lib/import/import-intel_fb_include.mk | 2 +- repos/dde_linux/lib/mk/intel_fb_include.mk | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/repos/dde_linux/lib/import/import-intel_fb_include.mk b/repos/dde_linux/lib/import/import-intel_fb_include.mk index ee4a43651..fbe67c972 100644 --- a/repos/dde_linux/lib/import/import-intel_fb_include.mk +++ b/repos/dde_linux/lib/import/import-intel_fb_include.mk @@ -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 diff --git a/repos/dde_linux/lib/mk/intel_fb_include.mk b/repos/dde_linux/lib/mk/intel_fb_include.mk index 7ea5de693..bc4fd59f8 100644 --- a/repos/dde_linux/lib/mk/intel_fb_include.mk +++ b/repos/dde_linux/lib/mk/intel_fb_include.mk @@ -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