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, master has been updated via da7ab3cf6d7cfea0a9994df7c8cbfd853aa276f5 (commit) via f13d4e0b09e9aa8f8a47b402438848deaf5a26d1 (commit) via 8bd492fd495cdf954d65052bc1470a08cd13fbd8 (commit) via 5e3aa60749506205f13c6db588930de61e84f46f (commit) via b848d53c8471748c751e1f00cd886ddb9ca0cb02 (commit) from 4c3656d99deb897a6571fa82da2502df991a657e (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 da7ab3cf6d7cfea0a9994df7c8cbfd853aa276f5 Merge: 4c3656d f13d4e0 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 29 13:50:55 2011 +0100

Merge remote-tracking branch 'ms/fake-uname'

Conflicts: lfs/fake-environ

commit f13d4e0b09e9aa8f8a47b402438848deaf5a26d1 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Dec 11 13:22:24 2011 +0100

Fix detection weather a toolchain can be built on host.

commit 8bd492fd495cdf954d65052bc1470a08cd13fbd8 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Dec 11 13:15:27 2011 +0100

CFLAGS: Explicitely enforce softfp.

commit 5e3aa60749506205f13c6db588930de61e84f46f Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Dec 11 12:29:54 2011 +0100

Enable build for armv5tel on armv7l.

commit b848d53c8471748c751e1f00cd886ddb9ca0cb02 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Dec 11 12:17:19 2011 +0100

Build preload lib to fake output of uname.

-----------------------------------------------------------------------

Summary of changes: lfs/fake-environ | 2 +- make.sh | 25 ++++++++++++++++++++++--- tools/make-functions | 6 +++--- 3 files changed, 26 insertions(+), 7 deletions(-)

Difference in files: diff --git a/lfs/fake-environ b/lfs/fake-environ index 7a0f1a4..b724912 100644 --- a/lfs/fake-environ +++ b/lfs/fake-environ @@ -52,7 +52,7 @@ $(TARGET) : cp -rvf $(DIR_SRC)/src/$(THISAPP) $(DIR_APP)

cd $(DIR_APP) && make install CFLAGS="$(CFLAGS)" \ - TOOLS_DIR="$(TOOLS_DIR)" + TOOLS_DIR="/tools"

@rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/make.sh b/make.sh index 8b9f48a..415c195 100755 --- a/make.sh +++ b/make.sh @@ -229,9 +229,28 @@ prepareenv() { }

buildtoolchain() { - if [ "$(uname -m)" = "x86_64" ]; then - exiterror "Cannot build toolchain on x86_64. Please use the download." - fi + local error=false + case "${MACHINE}:$(uname -m)" in + # x86 + i586:i586|i586:i686) + # These are working. + ;; + i586:*) + error=true + ;; + + # ARM + armv5tel:armv5tel|armv5tel:armv5tejl) + # These are working. + ;; + armv5tel:*) + error=true + ;; + esac + + ${error} && \ + exiterror "Cannot build ${MACHINE} toolchain on $(uname -m). Please use the download if any." + if [ "$(uname -r | grep ipfire)" ]; then exiterror "Cannot build toolchain on ipfire. Please use the download." fi diff --git a/tools/make-functions b/tools/make-functions index 144411c..783b46e 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -225,17 +225,17 @@ if [ 'x86_64' = $MACHINE -o 'i686' = $MACHINE -o 'i586' = $MACHINE ]; then CXXFLAGS="-O2 -march=i586 -pipe -fomit-frame-pointer" C2FLAGS="-O2 -march=i586 -mtune=i586 -pipe -fomit-frame-pointer" CXX2FLAGS="-O2 -march=i586 -mtune=i586 -pipe -fomit-frame-pointer" -elif [ 'armv5tejl' = $MACHINE -o 'armv5tel' = $MACHINE ]; then +elif [ 'armv5tejl' = $MACHINE -o 'armv5tel' = $MACHINE -o 'armv7l' = $MACHINE ]; then echo "`date -u '+%b %e %T'`: Machine is ARM (or equivalent)" >> $LOGFILE MACHINE=armv5tel MACHINE_TYPE=arm BUILDTARGET=${MACHINE}-unknown-linux-gnueabi - CFLAGS="-O2 -march=armv5te -fomit-frame-pointer -pipe" + CFLAGS="-O2 -march=armv5te -mfloat-abi=soft -fomit-frame-pointer -pipe" CXXFLAGS="$CFLAGS" C2FLAGS="$CFLAGS" CXX2FLAGS="$CXXFLAGS" else - echo "`date -u '+%b %e %T'`: Can't determine your architecture - $MACHINE" >> $LOGFILE + echo "`date -u '+%b %e %T'`: Can't determine your architecture - $MACHINE" exit 1 fi

hooks/post-receive -- IPFire 2.x development tree