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, kernel-update has been updated via 6c9d6fcc508ecc5d251bd8d8a8c82294f9d41127 (commit) via 743c467204cf4847a275e53eabd34a6b5b6af861 (commit) via 489589854945f9d52ff24ddb232486c44069e3c2 (commit) via 83d9f3dd20939782633d98ad51738a5df0f6dd90 (commit) via ad92a4b8ad4ed5a434abff422ceefae3d8f368d1 (commit) from ead7d6750a542648e397b999c04feeff03f0d7c4 (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 6c9d6fcc508ecc5d251bd8d8a8c82294f9d41127 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Aug 11 14:06:56 2012 -0400
toolchain: build toolchain on armv6l and armv7l.
fixed build on hostsystems with hw-float works.
commit 743c467204cf4847a275e53eabd34a6b5b6af861 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Aug 6 22:20:31 2012 +0200
ccache: Increase max cache size to 5GB.
commit 489589854945f9d52ff24ddb232486c44069e3c2 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Aug 6 22:07:05 2012 +0200
ccache: Remove unneeded patch.
commit 83d9f3dd20939782633d98ad51738a5df0f6dd90 Merge: ead7d67 ad92a4b Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Aug 11 12:59:10 2012 -0400
Merge remote-tracking branch 'ms/ccache-update' into kernel-update
commit ad92a4b8ad4ed5a434abff422ceefae3d8f368d1 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jul 31 22:40:33 2012 +0200
ccache: Update to 3.1.7.
-----------------------------------------------------------------------
Summary of changes: lfs/binutils | 1 + lfs/ccache | 7 +++---- lfs/gcc | 6 +++++- lfs/make | 4 ++++ make.sh | 14 +++++++++++--- src/patches/ccache-3.1.6-no_compiler_mtime.patch | 21 --------------------- tools/make-functions | 11 +++++++---- 7 files changed, 31 insertions(+), 33 deletions(-) delete mode 100644 src/patches/ccache-3.1.6-no_compiler_mtime.patch
Difference in files: diff --git a/lfs/binutils b/lfs/binutils index 2ff8474..073ee23 100644 --- a/lfs/binutils +++ b/lfs/binutils @@ -44,6 +44,7 @@ ifeq "$(ROOT)" "" else ifeq "$(PASS)" "1" TARGET = $(DIR_INFO)/$(THISAPP)-tools1 + CFLAGS = EXTRA_CONFIG = --prefix=/tools --disable-nls --disable-werror --disable-gprof #EXTRA_MAKE = LDFLAGS="-all-static" EXTRA_INSTALL = diff --git a/lfs/ccache b/lfs/ccache index b7cad86..3a8dc6e 100644 --- a/lfs/ccache +++ b/lfs/ccache @@ -24,7 +24,7 @@
include Config
-VER = 3.1.6 +VER = 3.1.7
THISAPP = ccache-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 343dc9b642e1d2af1e6bd8e474dde92e +$(DL_FILE)_MD5 = 82257745eac54826527946e9e3d046f4
install : $(TARGET)
@@ -70,8 +70,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/$(THISAPP)-no_compiler_mtime.patch - cd $(DIR_APP) && CFLAGS="-O2 -static -DDEFAULT_MAXSIZE=2097152" ./configure --prefix=$(ROOT)/usr/local + cd $(DIR_APP) && CFLAGS="-O2 -static -DDEFAULT_MAXSIZE=5242880" ./configure --prefix=$(ROOT)/usr/local cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install ln -sf ccache $(ROOT)/usr/local/bin/gcc diff --git a/lfs/gcc b/lfs/gcc index 785b965..7665074 100644 --- a/lfs/gcc +++ b/lfs/gcc @@ -53,7 +53,7 @@ ifeq "$(PASS)" "1" --disable-nls \ --enable-shared \ --enable-languages=c \ - --disable-bootstrap + --enable-bootstrap EXTRA_MAKE = EXTRA_INSTALL = else @@ -93,6 +93,10 @@ endif export XCFLAGS = $(CFLAGS) export TCFLAGS = $(CFLAGS)
+ifeq "$(PASS)" "1" + CFLAGS = +endif + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/make b/lfs/make index ba34283..13968fb 100644 --- a/lfs/make +++ b/lfs/make @@ -49,6 +49,10 @@ else EXTRA_INSTALL = endif
+ifeq "$(PASS)" "1" + CFLAGS = +endif + ############################################################################### # Top-level Rules ############################################################################### diff --git a/make.sh b/make.sh index 6fd78d9..7b6f1dc 100755 --- a/make.sh +++ b/make.sh @@ -37,7 +37,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'` MACHINE=`uname -m` GIT_TAG=$(git tag | tail -1) # Git Tag GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit -TOOLCHAINVER=3 +TOOLCHAINVER=4
BUILDMACHINE=$MACHINE if [ "$MACHINE" = "x86_64" ]; then @@ -222,7 +222,7 @@ prepareenv() { # Run LFS static binary creation scripts one by one export CCACHE_DIR=$BASEDIR/ccache export CCACHE_COMPRESS=1 - export CCACHE_HASHDIR=1 + export CCACHE_COMPILERCHECK="none"
# Remove pre-install list of installed files in case user erase some files before rebuild rm -f $BASEDIR/build/usr/src/lsalr 2>/dev/null @@ -240,7 +240,7 @@ buildtoolchain() { ;;
# ARM - armv5tel:armv5tel|armv5tel:armv5tejl|armv5tel:armv7l) + armv5tel:armv5tel|armv5tel:armv5tejl|armv5tel:armv6l|armv5tel:armv7l) # These are working. ;; armv5tel:*) @@ -255,6 +255,14 @@ buildtoolchain() { exiterror "Cannot build toolchain on ipfire. Please use the download." fi
+ if [ ! -e /usr/include/asm -o ! -e /usr/include/bits -o ! -e /usr/include/gnu -o ! -e /usr/include/sys ]; then + exiterror "Cannot build toolchain without (asm, bits, gnu or sys includes). Please fix or use the download." + fi + + if [ ! -e /usr/lib/libc.so ]; then + exiterror "Cannot build toolchain without (/usr/lib/libc.so). Please fix or use the download." + fi + LOGFILE="$BASEDIR/log/_build.toolchain.log" export LOGFILE NATIVEGCC=`gcc --version | grep GCC | awk {'print $3'}` diff --git a/src/patches/ccache-3.1.6-no_compiler_mtime.patch b/src/patches/ccache-3.1.6-no_compiler_mtime.patch deleted file mode 100644 index fd921cd..0000000 --- a/src/patches/ccache-3.1.6-no_compiler_mtime.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur ccache-3.1.org/ccache.c ccache-3.1/ccache.c ---- ccache-3.1.org/ccache.c 2010-09-16 19:01:09.000000000 +0200 -+++ ccache-3.1/ccache.c 2010-10-21 21:41:08.000000000 +0200 -@@ -805,13 +805,16 @@ - */ - compilercheck = getenv("CCACHE_COMPILERCHECK"); - if (!compilercheck) { -- compilercheck = "mtime"; -+ compilercheck = "size"; - } - if (str_eq(compilercheck, "none")) { - /* Do nothing. */ - } else if (str_eq(compilercheck, "content")) { - hash_delimiter(hash, "cc_content"); - hash_file(hash, args->argv[0]); -+ } else if (str_eq(compilercheck, "size")) { -+ hash_delimiter(hash, "cc_size"); -+ hash_int(hash, st.st_size); - } else if (str_eq(compilercheck, "mtime")) { - hash_delimiter(hash, "cc_mtime"); - hash_int(hash, st.st_size); diff --git a/tools/make-functions b/tools/make-functions index b6e0ff3..5450689 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -298,7 +298,7 @@ entershell() { CFLAGS="$CF2LAGS" CXXFLAGS="$CXX2FLAGS" \ CCACHE_DIR=/usr/src/ccache \ CCACHE_COMPRESS=1 \ - CCACHE_HASHDIR=1 \ + CCACHE_COMPILERCHECK="none" \ KVER=$KVER \ BUILDTARGET="$BUILDTARGET" \ MACHINE="$MACHINE" \ @@ -415,7 +415,8 @@ lfsmake2() { CONFIG_ROOT=$CONFIG_ROOT \ NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \ CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \ - CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 CCACHE_HASHDIR=1 \ + CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \ + CCACHE_COMPILERCHECK="none" \ KVER=$KVER MAKETUNING=$MAKETUNING \ BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \ MACHINE_TYPE="$MACHINE_TYPE" \ @@ -448,7 +449,8 @@ ipfiremake() { CONFIG_ROOT=$CONFIG_ROOT \ NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \ CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \ - CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 CCACHE_HASHDIR=1 \ + CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \ + CCACHE_COMPILERCHECK="none" \ KVER=$KVER MAKETUNING=$MAKETUNING \ BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \ MACHINE_TYPE="$MACHINE_TYPE" \ @@ -480,7 +482,8 @@ ipfiredist() { CONFIG_ROOT=$CONFIG_ROOT \ NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \ CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \ - CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 CCACHE_HASHDIR=1 \ + CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \ + CCACHE_COMPILERCHECK="none" \ KVER=$KVER \ BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \ MACHINE_TYPE="$MACHINE_TYPE" \
hooks/post-receive -- IPFire 2.x development tree