Packages: fix build error for libpng freetype libjpeg and directfb

Signed-off-by: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>

4 files changed, 25 insertions, 9 deletions

diff --git a/packages/graphics/directfb/directfb.mk b/packages/graphics/directfb/directfb.mk
index 6c1cb0b..0a385a4 100644
--- a/packages/graphics/directfb/directfb.mk
+++ b/packages/graphics/directfb/directfb.mk
@@ -33,6 +33,7 @@ FREETYPE_LIBS_FLAGS := "-L$(ROOTFS)/usr/lib32 -lfreetype"
 else
 FREETYPE_LIBS_FLAGS := "-L$(ROOTFS)/usr/lib -lfreetype"
 endif
+FREETYPE_CFLAGS_FLAGS := "-I$(SYSROOT)/usr/include/freetype2"
 
 directfb_install: $(DIRECTFB_BUILD_DIR)/.installed
 
@@ -43,6 +44,8 @@ $(DIRECTFB_BUILD_DIR)/.installed: libpng_install freetype_install \
 	DirectFB-$(DIRECTFB_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(DIRECTFB_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(DIRECTFB_BUILD_DIR) DESTDIR=$(ROOTFS) install
+	$(Q)-mv $(ROOTFS)/usr/include/* $(SYSROOT)/usr/include/
+	$(Q)rm -rf $(ROOTFS)/usr/include
 	@touch $@
 
 download_directfb:
@@ -70,9 +73,10 @@ $(DIRECTFB_BUILD_DIR)/.configured:
 	-L$(SYSROOT)/lib -L$(SYSROOT)/lib32" \
 	CPPFLAGS="-I$(SYSROOT)/usr/include" \
 	FREETYPE_LIBS=$(FREETYPE_LIBS_FLAGS) \
+	FREETYPE_CFLAGS=$(FREETYPE_CFLAGS_FLAGS) \
 	./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
 	--target=$(STRICT_GNU_TARGET) --prefix=/usr \
-	--includedir=$(SYSROOT)/usr/include --datarootdir=$(SYSROOT)/usr \
+	--datarootdir=$(SYSROOT)/usr \
 	--enable-static=no  --program-suffix=""
 	@touch $@
 
diff --git a/packages/graphics/freetype/freetype.mk b/packages/graphics/freetype/freetype.mk
index 18ed71b..3ae0adf 100644
--- a/packages/graphics/freetype/freetype.mk
+++ b/packages/graphics/freetype/freetype.mk
@@ -38,6 +38,8 @@ $(FREETYPE_BUILD_DIR)/.installed: zlib_target_install download_freetype \
 	$(Q)$(MAKE) $(FREETYPE_BUILD_DIR)/.libtoolpatched
 	$(Q)$(MAKE) $(FREETYPE_BUILD_DIR)/.pkgconfigpatched
 	$(Q)$(MAKE) $(FREETYPE_BUILD_DIR)/.freetype-configpatched
+	$(Q)-mv $(ROOTFS)/usr/include/* $(SYSROOT)/usr/include/
+	$(Q)rm -rf $(ROOTFS)/usr/include
 	@touch $@
 
 download_freetype:
@@ -59,7 +61,7 @@ $(FREETYPE_BUILD_DIR)/.configured:
 	PKG_CONFIG_SYSROOT_DIR=$(ROOTFS) \
 	CC=$(TARGETCC_CACHED) CFLAGS=$(TARGET_CFLAGS) \
 	./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
-	--prefix=/usr --includedir=$(SYSROOT)/usr/include \
+	--prefix=/usr \
 	--datarootdir=$(SYSROOT)/usr --enable-static=no
 	@touch $@
 
@@ -67,6 +69,7 @@ $(FREETYPE_BUILD_DIR)/.freetype-configpatched:
 	$(Q)cd $(ROOTFS)/usr/bin; \
 	cat freetype-config | \
 	sed -e 's;prefix=/usr;prefix=$(ROOTFS)/usr;' \
+	-e 's;includedir=$${prefix}/include;includedir=$(SYSROOT)/usr/include;' \
 	> freetype-config.new;\
 	cp freetype-config.new freetype-config; rm freetype-config.new
 
@@ -85,14 +88,16 @@ endif
 
 $(FREETYPE_BUILD_DIR)/.pkgconfigpatched:
 ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y)
-	$(Q)cd $(ROOTFS)/usr/lib32/pkgconfig; \
-	cat freetype2.pc | sed -e 's;prefix=\/usr;prefix=$(ROOTFS)\/usr;' \
+	$(Q)cd $(ROOTFS)/usr/lib32/pkgconfig;\
+	cat freetype2.pc | sed -e 's;prefix=/usr;prefix=$(ROOTFS)/usr;' \
+	-e 's;includedir=$${prefix}/include;includedir=$(SYSROOT)/usr/include;' \
 	> freetype2.pc.new;\
-	cp freetype2.pc.new freetype2.pc; rm  freetype2.pc.new
+	cp freetype2.pc.new freetype2.pc; rm freetype2.pc.new freetype2.pc.tmp
 else
 	$(Q)cd $(ROOTFS)/usr/lib/pkgconfig; \
-	cat freetype2.pc | sed -e 's;prefix=\/usr;prefix=$(ROOTFS)\/usr;' \
+	cat freetype2.pc | sed -e 's;prefix=/usr;prefix=$(ROOTFS)/usr;' \
+	-e 's;includedir=$${prefix}/include;includedir=$(SYSROOT)/usr/include;' \
 	> freetype2.pc.new;\
-	cp freetype2.pc.new freetype2.pc; rm  freetype2.pc.new
+	cp freetype2.pc.new freetype2.pc; rm freetype2.pc.new
 endif
 
diff --git a/packages/graphics/libjpeg/libjpeg.mk b/packages/graphics/libjpeg/libjpeg.mk
index b983691..ddefe22 100644
--- a/packages/graphics/libjpeg/libjpeg.mk
+++ b/packages/graphics/libjpeg/libjpeg.mk
@@ -36,6 +36,8 @@ $(LIBJPEG_BUILD_DIR)/.installed: download_libjpeg \
 	$(Q)$(MAKE) -C $(LIBJPEG_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(LIBJPEG_BUILD_DIR) DESTDIR=$(ROOTFS) install
 	$(Q)$(MAKE) $(LIBJPEG_BUILD_DIR)/.libtoolpatched
+	$(Q)-mv $(ROOTFS)/usr/include/* $(SYSROOT)/usr/include/
+	$(Q)rm -rf $(ROOTFS)/usr/include
 	@touch $@
 
 download_libjpeg:
@@ -58,7 +60,7 @@ $(LIBJPEG_BUILD_DIR)/.configured:
 	CC=$(TARGETCC_CACHED) CFLAGS=$(TARGET_CFLAGS) \
 	./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
 	--target=$(STRICT_GNU_TARGET) \
-	--prefix=/usr --includedir=$(SYSROOT)/usr/include \
+	--prefix=/usr \
 	--datarootdir=$(SYSROOT)/usr --enable-static=no --program-suffix=""
 	@touch $@
 
diff --git a/packages/graphics/libpng/libpng.mk b/packages/graphics/libpng/libpng.mk
index 55449aa..4fcc9a1 100644
--- a/packages/graphics/libpng/libpng.mk
+++ b/packages/graphics/libpng/libpng.mk
@@ -38,6 +38,8 @@ $(LIBPNG_BUILD_DIR)/.installed: zlib_target_install download_libpng \
 	$(Q)$(MAKE) $(LIBPNG_BUILD_DIR)/.libtoolpatched
 	$(Q)$(MAKE) $(LIBPNG_BUILD_DIR)/.pkgconfigpatched
 	$(Q)$(MAKE) $(LIBPNG_BUILD_DIR)/.libpng-configpatched
+	$(Q)-mv $(ROOTFS)/usr/include/* $(SYSROOT)/usr/include/
+	$(Q)rm -rf $(ROOTFS)/usr/include
 	@touch $@
 
 download_libpng:
@@ -59,7 +61,7 @@ $(LIBPNG_BUILD_DIR)/.configured:
 	PKG_CONFIG_SYSROOT_DIR=$(ROOTFS) \
 	CC=$(TARGETCC_CACHED) CFLAGS=$(TARGET_CFLAGS) \
 	./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
-	--prefix=/usr --includedir=$(SYSROOT)/usr/include \
+	--prefix=/usr \
 	--datarootdir=$(SYSROOT)/usr \
 	--enable-static=no --with-libpng-compat=no
 	@touch $@
@@ -68,6 +70,7 @@ $(LIBPNG_BUILD_DIR)/.libpng-configpatched:
 	$(Q)cd $(ROOTFS)/usr/bin; \
 	cat libpng-config | \
 	sed -e 's;prefix="/usr";prefix="$(ROOTFS)/usr";' \
+	-e 's;includedir="$${prefix}/include/libpng12";includedir="$(SYSROOT)/usr/include/libpng12";' \
 	> libpng-config.new;\
 	cp libpng-config.new libpng-config; rm libpng-config.new
 
@@ -88,11 +91,13 @@ $(LIBPNG_BUILD_DIR)/.pkgconfigpatched:
 ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y)
 	$(Q)cd $(ROOTFS)/usr/lib32/pkgconfig; \
 	cat libpng.pc | sed -e 's;prefix=\/usr;prefix=$(ROOTFS)\/usr;' \
+	-e 's;includedir=$${prefix}/include/libpng12;includedir=$(SYSROOT)/usr/include/libpng12;' \
 	> libpng.pc.new;\
 	cp libpng.pc.new libpng.pc; rm  libpng.pc.new
 else
 	$(Q)cd $(ROOTFS)/usr/lib/pkgconfig; \
 	cat libpng.pc | sed -e 's;prefix=\/usr;prefix=$(ROOTFS)\/usr;' \
+	-e 's;includedir=$${prefix}/include/libpng12;includedir=$(SYSROOT)/usr/include/libpng12;' \
 	> libpng.pc.new;\
 	cp libpng.pc.new libpng.pc; rm  libpng.pc.new
 endif