This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via e3acfbc1c7f409974b5f7ab29cdda7f94e779588 (commit) via 61da1e32f99f699cd7bffce23cb5031c290758da (commit) via ea465705ad9b11af4d08417518ee8068c73477a7 (commit) via c78e43d7826bd7a2a6a40275964db0f8b3941294 (commit) from 01d89a24d3701e2aa79b0681a20ee64de3c899c4 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit e3acfbc1c7f409974b5f7ab29cdda7f94e779588 Merge: 61da1e3 01d89a2 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Jun 1 19:19:54 2017 +0200
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
commit 61da1e32f99f699cd7bffce23cb5031c290758da Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Jun 1 19:18:58 2017 +0200
bash: fix symlink in toolchain
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit ea465705ad9b11af4d08417518ee8068c73477a7 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Jun 1 19:17:50 2017 +0200
make.sh: remove display of native gcc
this grep fails on debian and the output is useless
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit c78e43d7826bd7a2a6a40275964db0f8b3941294 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Jun 1 19:16:00 2017 +0200
ncurses: fix toolchain build
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: lfs/bash | 1 + lfs/ncurses | 2 +- make.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-)
Difference in files: diff --git a/lfs/bash b/lfs/bash index 6e09c5b..04e6c50 100644 --- 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 dd6e56f..1d8fd40 100644 --- 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 226d4dc..9c4c6ca 100755 --- 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
hooks/post-receive -- IPFire 2.x development tree