diff options
-rw-r--r-- | packages/graphics/atk/atk.mk | 1 | ||||
-rw-r--r-- | packages/graphics/cairo/cairo.mk | 1 | ||||
-rw-r--r-- | packages/graphics/directfb/directfb.mk | 1 | ||||
-rw-r--r-- | packages/graphics/fontconfig/fontconfig.mk | 3 | ||||
-rw-r--r-- | packages/graphics/freetype/freetype.mk | 3 | ||||
-rw-r--r-- | packages/graphics/gtk/gtk.mk | 7 | ||||
-rw-r--r-- | packages/graphics/libjpeg/libjpeg.mk | 1 | ||||
-rw-r--r-- | packages/graphics/libpng/libpng.mk | 1 | ||||
-rw-r--r-- | packages/graphics/libtiff/libtiff.mk | 1 | ||||
-rw-r--r-- | packages/graphics/pixman/pixman.mk | 1 | ||||
-rw-r--r-- | packages/misc/gettext/gettext.mk | 4 | ||||
-rw-r--r-- | packages/misc/glib/glib.mk | 14 | ||||
-rw-r--r-- | packages/misc/libxml/libxml.mk | 3 | ||||
-rw-r--r-- | packages/misc/pango/pango.mk | 3 |
14 files changed, 34 insertions, 10 deletions
diff --git a/packages/graphics/atk/atk.mk b/packages/graphics/atk/atk.mk index 9ff1939..25db5a7 100644 --- a/packages/graphics/atk/atk.mk +++ b/packages/graphics/atk/atk.mk @@ -46,6 +46,7 @@ $(ATK_BUILD_DIR)/.installed: glib_install download_atk \ $(ATK_BUILD_DIR)/.decompressed $(ATK_BUILD_DIR)/.configured $(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \ atk-$(ATK_VERSION) in your root filesystem...") + $(call KILL_LT_RPATH, $(ATK_BUILD_DIR)) $(Q)$(MAKE) -C $(ATK_BUILD_DIR) $(J) $(Q)$(MAKE) -C $(ATK_BUILD_DIR) DESTDIR=$(SYSROOT) install $(Q)$(MAKE) libtool_files_adapt diff --git a/packages/graphics/cairo/cairo.mk b/packages/graphics/cairo/cairo.mk index 5a8f71c..3513e1d 100644 --- a/packages/graphics/cairo/cairo.mk +++ b/packages/graphics/cairo/cairo.mk @@ -40,6 +40,7 @@ $(CAIRO_BUILD_DIR)/.installed: pixman_install libpng_install freetype_install \ $(CAIRO_BUILD_DIR)/.decompressed $(CAIRO_BUILD_DIR)/.configured $(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \ cairo-$(CAIRO_VERSION) in your root filesystem...") + $(call KILL_LT_RPATH, $(CAIRO_BUILD_DIR)) $(Q)$(MAKE) -C $(CAIRO_BUILD_DIR) $(J) $(Q)$(MAKE) -C $(CAIRO_BUILD_DIR) DESTDIR=$(SYSROOT) install $(Q)$(MAKE) libtool_files_adapt diff --git a/packages/graphics/directfb/directfb.mk b/packages/graphics/directfb/directfb.mk index cf0a754..c74f376 100644 --- a/packages/graphics/directfb/directfb.mk +++ b/packages/graphics/directfb/directfb.mk @@ -50,6 +50,7 @@ $(DIRECTFB_BUILD_DIR)/.installed: libpng_install freetype_install \ $(DIRECTFB_BUILD_DIR)/.decompressed $(DIRECTFB_BUILD_DIR)/.configured $(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \ DirectFB-$(DIRECTFB_VERSION) in your root filesystem...") + $(call KILL_LT_RPATH, $(DIRECTFB_BUILD_DIR)) $(Q)$(MAKE) -C $(DIRECTFB_BUILD_DIR) $(J) $(Q)$(MAKE) -C $(DIRECTFB_BUILD_DIR) DESTDIR=$(SYSROOT) install $(Q)$(MAKE) libtool_files_adapt diff --git a/packages/graphics/fontconfig/fontconfig.mk b/packages/graphics/fontconfig/fontconfig.mk index e958206..1bde182 100644 --- a/packages/graphics/fontconfig/fontconfig.mk +++ b/packages/graphics/fontconfig/fontconfig.mk @@ -47,6 +47,7 @@ $(FONTCONFIG_BUILD_DIR)/.installed: libxml2_install \ $(FONTCONFIG_BUILD_DIR)/.configured $(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \ fontconfig-$(FONTCONFIG_VERSION) in your root filesystem...") + $(call KILL_LT_RPATH, $(FONTCONFIG_BUILD_DIR)) $(Q)$(MAKE) -C $(FONTCONFIG_BUILD_DIR) $(J) $(Q)$(MAKE) -C $(FONTCONFIG_BUILD_DIR) DESTDIR=$(SYSROOT) install $(Q)$(MAKE) libtool_files_adapt @@ -95,6 +96,6 @@ ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) endif $(FONTCONFIG_BUILD_DIR)/.special: - $(Q)-cp $(SYSROOT)/usr/etc/fonts $(ROOTFS)/etc/ + $(Q)-cp -R $(SYSROOT)/usr/etc/fonts $(ROOTFS)/etc/ @touch $@ diff --git a/packages/graphics/freetype/freetype.mk b/packages/graphics/freetype/freetype.mk index 1ff619f..91456e1 100644 --- a/packages/graphics/freetype/freetype.mk +++ b/packages/graphics/freetype/freetype.mk @@ -39,6 +39,7 @@ $(FREETYPE_BUILD_DIR)/.installed: zlib_target_install download_freetype \ $(FREETYPE_BUILD_DIR)/.decompressed $(FREETYPE_BUILD_DIR)/.configured $(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \ freetype-$(FREETYPE_VERSION) in your root filesystem...") + $(call KILL_LT_RPATH, $(FREETYPE_BUILD_DIR)) $(Q)$(MAKE) -C $(FREETYPE_BUILD_DIR) $(J) $(Q)$(MAKE) -C $(FREETYPE_BUILD_DIR) DESTDIR=$(SYSROOT) install $(Q)$(MAKE) libtool_files_adapt @@ -62,7 +63,7 @@ $(FREETYPE_BUILD_DIR)/.configured: $(Q)cd $(FREETYPE_BUILD_DIR); \ CC=$(TARGETCC_CACHED) CFLAGS="$(TARGET_CFLAGS)" \ ./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \ - --prefix=/usr --enable-static=no + --prefix=/usr --enable-static=no --disable-rpath @touch $@ $(FREETYPE_BUILD_DIR)/.freetype-configpatched: diff --git a/packages/graphics/gtk/gtk.mk b/packages/graphics/gtk/gtk.mk index f765810..39f2a51 100644 --- a/packages/graphics/gtk/gtk.mk +++ b/packages/graphics/gtk/gtk.mk @@ -48,6 +48,7 @@ $(GTK_BUILD_DIR)/.installed: directfb_install libtiff_install \ $(GTK_BUILD_DIR)/.configured $(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \ gtk-$(GTK_VERSION) in your root filesystem...") + $(call KILL_LT_RPATH, $(GTK_BUILD_DIR)) $(Q)$(MAKE) -C $(GTK_BUILD_DIR) $(J) $(Q)$(MAKE) -C $(GTK_BUILD_DIR) DESTDIR=$(SYSROOT) install $(Q)$(MAKE) libtool_files_adapt @@ -122,11 +123,11 @@ endif .PHONY: gtk_clean $(GTK_BUILD_DIR)/.special $(GTK_BUILD_DIR)/.special: - $(Q)-cp $(SYSROOT)/usr/etc/gtk-* $(ROOTFS)/etc/ + $(Q)-cp -R $(SYSROOT)/usr/etc/gtk-* $(ROOTFS)/etc/ ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)-cp $(SYSROOT)/usr/lib32/gtk-* $(ROOTFS)/usr/lib32/ + $(Q)-cp -R $(SYSROOT)/usr/lib32/gtk-* $(ROOTFS)/usr/lib32/ else - $(Q)-cp $(SYSROOT)/usr/lib/gtk-* $(ROOTFS)/usr/lib/ + $(Q)-cp -R $(SYSROOT)/usr/lib/gtk-* $(ROOTFS)/usr/lib/ endif @touch $@ diff --git a/packages/graphics/libjpeg/libjpeg.mk b/packages/graphics/libjpeg/libjpeg.mk index d62bf14..5a28662 100644 --- a/packages/graphics/libjpeg/libjpeg.mk +++ b/packages/graphics/libjpeg/libjpeg.mk @@ -38,6 +38,7 @@ $(LIBJPEG_BUILD_DIR)/.installed: download_libjpeg \ $(LIBJPEG_BUILD_DIR)/.decompressed $(LIBJPEG_BUILD_DIR)/.configured $(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \ jpeg-$(LIBJPEG_VERSION) in your root filesystem...") + $(call KILL_LT_RPATH, $(LIBJPEG_BUILD_DIR)) $(Q)$(MAKE) -C $(LIBJPEG_BUILD_DIR) $(J) $(Q)$(MAKE) -C $(LIBJPEG_BUILD_DIR) DESTDIR=$(SYSROOT) install $(Q)$(MAKE) libtool_files_adapt diff --git a/packages/graphics/libpng/libpng.mk b/packages/graphics/libpng/libpng.mk index d3ca55b..c0fd654 100644 --- a/packages/graphics/libpng/libpng.mk +++ b/packages/graphics/libpng/libpng.mk @@ -39,6 +39,7 @@ $(LIBPNG_BUILD_DIR)/.installed: zlib_target_install download_libpng \ $(LIBPNG_BUILD_DIR)/.decompressed $(LIBPNG_BUILD_DIR)/.configured $(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \ libpng-$(LIBPNG_VERSION) in your root filesystem...") + $(call KILL_LT_RPATH, $(LIBPNG_BUILD_DIR)) $(Q)$(MAKE) -C $(LIBPNG_BUILD_DIR) $(J) $(Q)$(MAKE) -C $(LIBPNG_BUILD_DIR) DESTDIR=$(SYSROOT) install $(Q)$(MAKE) libtool_files_adapt diff --git a/packages/graphics/libtiff/libtiff.mk b/packages/graphics/libtiff/libtiff.mk index 1fa5441..68375a4 100644 --- a/packages/graphics/libtiff/libtiff.mk +++ b/packages/graphics/libtiff/libtiff.mk @@ -48,6 +48,7 @@ $(LIBTIFF_BUILD_DIR)/.installed: download_libtiff \ $(LIBTIFF_BUILD_DIR)/.decompressed $(LIBTIFF_BUILD_DIR)/.configured $(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \ libtiff-$(LIBTIFF_VERSION) in your root filesystem...") + $(call KILL_LT_RPATH, $(LIBTIFF_BUILD_DIR)) $(Q)$(MAKE) -C $(LIBTIFF_BUILD_DIR) $(J) $(Q)$(MAKE) -C $(LIBTIFF_BUILD_DIR) DESTDIR=$(SYSROOT) install $(Q)$(MAKE) libtool_files_adapt diff --git a/packages/graphics/pixman/pixman.mk b/packages/graphics/pixman/pixman.mk index 7966336..0a739ab 100644 --- a/packages/graphics/pixman/pixman.mk +++ b/packages/graphics/pixman/pixman.mk @@ -45,6 +45,7 @@ $(PIXMAN_BUILD_DIR)/.installed: download_pixman \ $(PIXMAN_BUILD_DIR)/.decompressed $(PIXMAN_BUILD_DIR)/.configured $(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \ pixman-$(PIXMAN_VERSION) in your root filesystem...") + $(call KILL_LT_RPATH, $(PIXMAN_BUILD_DIR)) $(Q)$(MAKE) -C $(PIXMAN_BUILD_DIR) $(J) $(Q)$(MAKE) -C $(PIXMAN_BUILD_DIR) DESTDIR=$(SYSROOT) install $(Q)$(MAKE) libtool_files_adapt diff --git a/packages/misc/gettext/gettext.mk b/packages/misc/gettext/gettext.mk index e6c2707..3452724 100644 --- a/packages/misc/gettext/gettext.mk +++ b/packages/misc/gettext/gettext.mk @@ -42,6 +42,7 @@ $(GETTEXT_BUILD_DIR)/.installed: termcap_target_install download_gettext \ $(GETTEXT_BUILD_DIR)/.decompressed $(GETTEXT_BUILD_DIR)/.configured $(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \ gettext-$(GETTEXT_VERSION) in your root filesystem...") + $(call KILL_LT_RPATH, $(GETTEXT_BUILD_DIR)) $(Q)$(MAKE) -C $(GETTEXT_BUILD_DIR) $(J) $(Q)$(MAKE) -C $(GETTEXT_BUILD_DIR) install @touch $@ @@ -67,9 +68,8 @@ $(GETTEXT_BUILD_DIR)/.configured: CPPFLGAS="-I$(SYSROOT)/usr/include" \ gl_cv_func_wcwidth_works=yes \ am_cv_func_iconv_works=yes \ - gl_cv_func_wcwidth_works=yes \ gt_cv_func_printf_posix=yes \ - gt_cv_int_divbyzero_sigfpe=yes \ + gt_cv_int_divbyzero_sigfpe=no \ ./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \ --target=$(STRICT_GNU_TARGET) \ --prefix=$(SYSROOT)/usr --with-included-gettext --disable-rpath diff --git a/packages/misc/glib/glib.mk b/packages/misc/glib/glib.mk index 238c6fc..6699b27 100644 --- a/packages/misc/glib/glib.mk +++ b/packages/misc/glib/glib.mk @@ -41,6 +41,7 @@ $(GLIB_BUILD_DIR)/.installed: gettext_install download_glib \ $(GLIB_BUILD_DIR)/.decompressed $(GLIB_BUILD_DIR)/.configured $(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \ glib-$(GLIB_VERSION) in your root filesystem...") + $(call KILL_LT_RPATH, $(GLIB_BUILD_DIR)) $(Q)$(MAKE) -C $(GLIB_BUILD_DIR) $(J) $(Q)$(MAKE) -C $(GLIB_BUILD_DIR) DESTDIR=$(SYSROOT) install $(Q)$(MAKE) libtool_files_adapt @@ -62,12 +63,23 @@ $(GLIB_BUILD_DIR)/.decompressed: $(GLIB_BUILD_DIR)/.configured: $(Q)cd $(GLIB_BUILD_DIR); \ - CC=$(TARGETCC_CACHED) CXX=$(TARGETCXX_CACHED) \ + CC=$(TARGETCC_CACHED) \ + CXX=$(TARGETCXX_CACHED) \ + AR=$(TARGETAR) \ + RANLIB=$(TARGETRANLIB) \ + AS=$(CROSS_COMPILE)as \ + LD=$(TARGETLD) \ + NM=$(TARGETNM) \ + STRIP=$(TARGETSTRIP) \ + OBJDUMP=$(TARGETOBJDUMP) \ + OBJCOPY=$(TARGETOBJCOPY) \ CFLAGS="$(TARGET_CFLAGS)" \ + CXXFLAGS="$(TARGET_CFLAGS)" \ LDFLAGS="-L$(SYSROOT)/lib -L$(SYSROOT)/usr/lib \ -L$(SYSROOT)/lib32 -L$(SYSROOT)/usr/lib32" \ CPPFLGAS="-I$(SYSROOT)/usr/include" \ PKG_CONFIG=$(PKGCONFIG_BIN) \ + PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ glib_cv_stack_grows=no \ glib_cv_uscore=yes \ ac_cv_func_posix_getpwuid_r=yes \ diff --git a/packages/misc/libxml/libxml.mk b/packages/misc/libxml/libxml.mk index 5273bd8..92e8782 100644 --- a/packages/misc/libxml/libxml.mk +++ b/packages/misc/libxml/libxml.mk @@ -40,6 +40,7 @@ $(LIBXML2_BUILD_DIR)/.installed: download_libxml2 \ $(LIBXML2_BUILD_DIR)/.decompressed $(LIBXML2_BUILD_DIR)/.configured $(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \ libxml2-$(LIBXML2_VERSION) in your root filesystem...") + $(call KILL_LT_RPATH, $(LIBXML2_BUILD_DIR)) $(Q)$(MAKE) -C $(LIBXML2_BUILD_DIR) $(J) $(Q)$(MAKE) -C $(LIBXML2_BUILD_DIR) DESTDIR=$(SYSROOT) install $(Q)$(MAKE) libtool_files_adapt @@ -69,7 +70,7 @@ $(LIBXML2_BUILD_DIR)/.configured: PKG_CONFIG_PATH=$(SYSROOT)/usr \ ./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \ --target=$(STRICT_GNU_TARGET) \ - --prefix=/usr + --prefix=/usr --disable-rpath @touch $@ libxml2_clean: diff --git a/packages/misc/pango/pango.mk b/packages/misc/pango/pango.mk index 59347ab..2e289e8 100644 --- a/packages/misc/pango/pango.mk +++ b/packages/misc/pango/pango.mk @@ -48,7 +48,8 @@ $(PANGO_BUILD_DIR)/.installed: $(GLIB_BUILD_DIR)/.installed \ $(PANGO_BUILD_DIR)/.configured $(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \ pango-$(PANGO_VERSION) in your root filesystem...") - $(Q)$(MAKE) -C $(PANGO_BUILD_DIR) $(J) V=1 + $(call KILL_LT_RPATH, $(PANGO_BUILD_DIR)) + $(Q)$(MAKE) -C $(PANGO_BUILD_DIR) $(J) $(Q)$(MAKE) -C $(PANGO_BUILD_DIR) DESTDIR=$(SYSROOT) install $(Q)$(MAKE) libtool_files_adapt $(Q)$(MAKE) pkgconfig_files_adapt |