From cf94ae3bf7ea1c124c50a11757a6251f8a73236e Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Sat, 27 Feb 2010 22:42:46 +0100 Subject: Packages: massive packages build fix for CONFIG_EMBTK_64BITS_FS_COMPAT32 Signed-off-by: Abdoulaye Walsimou Gaye --- packages/misc/foo/foo.mk | 2 +- packages/misc/glib/glib.mk | 2 +- packages/misc/libelf/libelf.mk | 2 +- packages/misc/libxml/libxml.mk | 3 +-- packages/misc/ncurses/ncurses.mk | 3 ++- packages/misc/pango/pango.kconfig | 1 + packages/misc/pango/pango.mk | 40 +++++++-------------------------------- 7 files changed, 14 insertions(+), 39 deletions(-) (limited to 'packages/misc') diff --git a/packages/misc/foo/foo.mk b/packages/misc/foo/foo.mk index 9775521..d5e8445 100644 --- a/packages/misc/foo/foo.mk +++ b/packages/misc/foo/foo.mk @@ -76,7 +76,7 @@ $(FOO_BUILD_DIR)/.configured: PKG_CONFIG=$(PKGCONFIG_BIN) \ PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ ./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \ - --target=$(STRICT_GNU_TARGET) \ + --target=$(STRICT_GNU_TARGET) --libdir=/usr/$(LIBDIR) \ --prefix=/usr @touch $@ diff --git a/packages/misc/glib/glib.mk b/packages/misc/glib/glib.mk index 2d0f72c..e78251f 100644 --- a/packages/misc/glib/glib.mk +++ b/packages/misc/glib/glib.mk @@ -86,7 +86,7 @@ $(GLIB_BUILD_DIR)/.configured: ac_cv_func_nonposix_getpwuid_r=no \ ac_cv_func_posix_getgrgid_r=yes \ ./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \ - --target=$(STRICT_GNU_TARGET) \ + --target=$(STRICT_GNU_TARGET) --libdir=/usr/$(LIBDIR) \ --prefix=/usr --disable-fam @touch $@ diff --git a/packages/misc/libelf/libelf.mk b/packages/misc/libelf/libelf.mk index ea28e89..de849f4 100644 --- a/packages/misc/libelf/libelf.mk +++ b/packages/misc/libelf/libelf.mk @@ -93,7 +93,7 @@ $(LIBELF_BUILD_DIR)/.configured: ./configure --build=$(HOST_BUILD) \ --host=$(STRICT_GNU_TARGET) \ --target=$(STRICT_GNU_TARGET) \ - --prefix=$(SYSROOT)/usr --enable-elf64 + --prefix=$(SYSROOT)/usr --enable-elf64 --libdir=$(SYSROOT)/usr/$(LIBDIR) @touch $@ libelf_clean: diff --git a/packages/misc/libxml/libxml.mk b/packages/misc/libxml/libxml.mk index f1e91b1..9d3731e 100644 --- a/packages/misc/libxml/libxml.mk +++ b/packages/misc/libxml/libxml.mk @@ -66,9 +66,8 @@ $(LIBXML2_BUILD_DIR)/.configured: LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \ CPPFLGAS="-I$(SYSROOT)/usr/include" \ PKG_CONFIG=$(PKGCONFIG_BIN) \ - PKG_CONFIG_PATH=$(SYSROOT)/usr \ ./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \ - --target=$(STRICT_GNU_TARGET) \ + --target=$(STRICT_GNU_TARGET) --libdir=/usr/$(LIBDIR) \ --prefix=/usr --disable-rpath @touch $@ diff --git a/packages/misc/ncurses/ncurses.mk b/packages/misc/ncurses/ncurses.mk index d66280e..20a0361 100644 --- a/packages/misc/ncurses/ncurses.mk +++ b/packages/misc/ncurses/ncurses.mk @@ -88,7 +88,8 @@ $(NCURSES_BUILD_DIR)/.configured: PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ ./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \ --target=$(STRICT_GNU_TARGET) --program-prefix="" \ - --prefix=/usr --disable-rpath --without-cxx-binding --without-ada + --prefix=/usr --disable-rpath --without-cxx-binding --without-ada \ + --libdir=/usr/$(LIBDIR) @touch $@ ncurses_clean: diff --git a/packages/misc/pango/pango.kconfig b/packages/misc/pango/pango.kconfig index 0e9a80d..26724cc 100644 --- a/packages/misc/pango/pango.kconfig +++ b/packages/misc/pango/pango.kconfig @@ -27,6 +27,7 @@ config EMBTK_HAVE_PANGO select EMBTK_HAVE_GLIB select EMBTK_HAVE_FONTCONFIG select EMBTK_HAVE_CAIRO + select EMBTK_GCC_MORE_LANGUAGES select EMBTK_GCC_LANGUAGE_CPP help Pango is a library for laying out and rendering of text, with an diff --git a/packages/misc/pango/pango.mk b/packages/misc/pango/pango.mk index 5f6d007..ed061d1 100644 --- a/packages/misc/pango/pango.mk +++ b/packages/misc/pango/pango.mk @@ -34,12 +34,6 @@ PANGO_INCLUDES = pango* PANGO_LIBS = pango-* pango* libpango* PANGO_PKGCONFIGS = pango*.pc -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib32/pkgconfig -else -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib/pkgconfig -endif - pango_install: $(PANGO_BUILD_DIR)/.installed $(PANGO_BUILD_DIR)/.special $(PANGO_BUILD_DIR)/.installed: $(GLIB_BUILD_DIR)/.installed \ @@ -88,41 +82,25 @@ $(PANGO_BUILD_DIR)/.configured: PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ PKG_CONFIG_LIBDIR=$(SYSROOT)/usr/lib \ ./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \ - --target=$(STRICT_GNU_TARGET) \ + --target=$(STRICT_GNU_TARGET) --libdir=/usr/$(LIBDIR) \ --prefix=/usr --without-x @touch $@ $(PANGO_BUILD_DIR)/.patchlibtool: -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)PANGO_LT_FILES=`find $(SYSROOT)/usr/lib32/pango/* -type f -name *.la`; \ - for i in $$PANGO_LT_FILES; \ - do \ - sed \ - -e "s; \/usr\/lib32\/libpangoft2-1.0.la ; $(SYSROOT)\/usr\/lib32\/libpangoft2-1.0.la ;" \ - -e "s; \/usr\/lib32\/libpango-1.0.la ; $(SYSROOT)\/usr\/lib32\/libpango-1.0.la ;" \ - < $$i > $$i.new; \ - mv $$i.new $$i; \ - done -else - $(Q)PANGO_LT_FILES=`find $(SYSROOT)/usr/lib/* -type f -name *.la`; \ + $(Q)PANGO_LT_FILES=`find $(SYSROOT)/usr/$(LIBDIR)/* -type f -name *.la`; \ for i in $$PANGO_LT_FILES; \ do \ sed \ - -e "s; \/usr\/lib\/libpangoft2-1.0.la ; $(SYSROOT)\/usr\/lib\/libpangoft2-1.0.la ;" \ - -e "s; \/usr\/lib\/libpango-1.0.la ; $(SYSROOT)\/usr\/lib\/libpango-1.0.la ;" \ + -e "s;\/usr\/$(LIBDIR)\/libpangoft2-1.0.la ; $(SYSROOT)\/usr\/$(LIBDIR)\/libpangoft2-1.0.la ;" \ + -e "s;\/usr\/$(LIBDIR)\/libpango-1.0.la ; $(SYSROOT)\/usr\/$(LIBDIR)\/libpango-1.0.la ;" \ < $$i > $$i.new; \ mv $$i.new $$i; \ done -endif .PHONY: pango_clean $(PANGO_BUILD_DIR)/.special $(PANGO_BUILD_DIR)/.special: -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)-cp -R $(SYSROOT)/usr/lib32/pango $(ROOTFS)/usr/lib32/ -else - $(Q)-cp -R $(SYSROOT)/usr/lib/pango $(ROOTFS)/usr/lib/ -endif + $(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/pango $(ROOTFS)/usr/$(LIBDIR)/ @touch $@ pango_clean: @@ -130,10 +108,6 @@ pango_clean: $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(PANGO_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(PANGO_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(PANGO_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(PANGO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib/pkgconfig; rm -rf $(PANGO_PKGCONFIGS) -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(PANGO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib32/pkgconfig; rm -rf $(PANGO_PKGCONFIGS) -endif + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(PANGO_LIBS) + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(PANGO_PKGCONFIGS) -- cgit v1.2.3