Now, gcc _really_ links everything against libintl.

diff --git a/lfs/adjust-toolchain b/lfs/adjust-toolchain
index 600da9a8139f99ec0ad134ce847108e31297aaa1..0c9e4d72f5487e988960b3798dfd2e7ddb4bb1a5 100644 (file)
--- a/lfs/adjust-toolchain
+++ b/lfs/adjust-toolchain
@@ -69,11 +69,4 @@ ifeq "$(STAGE)" "base"
                > $$(dirname $$(gcc --print-libgcc-file-name))/myspecs
 endif
 
-ifeq "$(STAGE)" "installer"
-       $(UCLIBC_TARGET)-gcc -dumpspecs \
-               > $$($(UCLIBC_TARGET)-gcc --print-file specs)
-       sed -e 's/%{shared:-lc}/%{!nointl: -lintl} &/' \
-               -i $$($(UCLIBC_TARGET)-gcc --print-file specs)
-endif
-
        @$(POSTBUILD)

diff --git a/lfs/gcc b/lfs/gcc
index fdd70b9bb3a28cb49a172998a6127a1fb456a5df..3adc45b5b9ea07ba812454e06f480350a32ba01c 100644 (file)
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -48,7 +48,8 @@ objects = $(DL_FILE) \
        $(THISAPP)-uClibc_c99-snprintf.patch \
        $(THISAPP)-fstack_protector-1.patch \
        $(THISAPP)-fortify_source-2.patch \
-       $(THISAPP)-fpie-1.patch
+       $(THISAPP)-fpie-1.patch \
+       $(THISAPP)-libintl.patch
 
 install : $(TARGET)
 
@@ -226,6 +227,7 @@ ifeq "$(PASS)" "2"
 ifeq "$(PIE)" "1"
        cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-fpie-1.patch
 endif
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-libintl.patch
        cd $(DIR_SRC)/gcc-build && CC_FOR_BUILD="$(HOST_GCC)" ../$(THISAPP)/configure \
                                                --target=$(UCLIBC_TARGET) \
                                                --prefix=$(UCLIBC_DIR) \

diff --git a/lfs/gettext b/lfs/gettext
index 60c5a9b9afc27b667efd80737eb9a5664f96534f..8f03f6ed356fc27aaafe41fd9da0bfc175dcce34 100644 (file)
--- a/lfs/gettext
+++ b/lfs/gettext
@@ -31,7 +31,11 @@ THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
-TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+ifeq "$(STAGE)" "installer"
+       TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)-pass$(PASS)
+else
+       TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+endif
 
 ###############################################################################
 # Top-level Rules

diff --git a/make.sh b/make.sh
index 5ea3a78c05d4c5fd9e9b1aea0831eaf3c10728e4..a47979d1e4c3d5aca6e0c358be07a8ba6be89f97 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -427,9 +427,9 @@ installer_build() {
        ipfire_make uClibc              PASS=1
        ipfire_make gcc                 PASS=1
        ipfire_make uClibc              PASS=2
+       ipfire_make gettext             PASS=1
        ipfire_make gcc                 PASS=2
-       ipfire_make gettext
-       ipfire_make adjust-toolchain
+       ipfire_make gettext             PASS=2
        ipfire_make udev
        ipfire_make pciutils
        ipfire_make zlib