Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

diff --git a/lfs/bash b/lfs/bash
index 6e09c5b1b770216e48126b6624accc8444b6fe12..04e6c5084e2df9b1715fbf92908eccbf98f05215 100644 (file)
--- a/lfs/bash
+++ b/lfs/bash
@@ -101,6 +101,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 ifeq "$(TOOLCHAIN)" "1"
        ln -svf bash /tools/bin/sh
+       ln -svf ../tools/bin/bash $(ROOT)/bin/sh
 else
        ln -svf bash /bin/sh
 endif

diff --git a/lfs/ncurses b/lfs/ncurses
index dd6e56f1ce776691fb3835ea36f3f6f87cc28a7f..1d8fd40d2181e0da29b9e42f514833686628cabd 100644 (file)
--- a/lfs/ncurses
+++ b/lfs/ncurses
@@ -96,7 +96,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 ifneq "$(ROOT)" ""
        mkdir -pv /tools/lib/pkgconfig/
 endif
-       cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
+       cd $(DIR_APP) && CPPFLAGS=-P ./configure $(EXTRA_CONFIG)
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
 

diff --git a/make.sh b/make.sh
index 226d4dcd0bcf00e2947be7c9f3e07d74f0d58a7b..9c4c6ca089fcd0dae148b692b6f4329d945a1228 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1014,7 +1014,7 @@ build)
        #only restore on a clean disk
        if [ ! -e "${BASEDIR}/build/tools/.toolchain-successful" ]; then
                if [ ! -n "$PACKAGE" ]; then
-                       beautify build_stage "Full toolchain compilation - Native GCC: `gcc --version | grep GCC | awk {'print $3'}`"
+                       beautify build_stage "Full toolchain compilation"
                        prepareenv
                        buildtoolchain
                else