diff options
Diffstat (limited to 'packages/misc')
-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 |
4 files changed, 19 insertions, 5 deletions
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 |