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 38c982bb77390f53744815eedb877ebeab05ba4b (commit) via cfac7c232c136363dad5b451549394d996cef1b2 (commit) via cfeeb42f7a794d00599929d6bb0e7f46e27b3036 (commit) via bc7fffe693f9c4b8aa26121fa7ff6d7e1e662c0f (commit) via b8efe40c89cb7fc95941b3054e1e6d56437185ad (commit) from c1cd3a8bf8b5e2df4faaaba39b32f7c40bffa638 (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 38c982bb77390f53744815eedb877ebeab05ba4b Merge: c1cd3a8 cfac7c2 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Oct 22 20:17:15 2010 +0200

Merge commit 'origin/master' into next

Conflicts: src/paks/linux-pae/uninstall.sh

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

Summary of changes: lfs/ccache | 8 +++--- make.sh | 5 ++- src/patches/ccache-3.0pre0-no_compiler_mtime.patch | 19 ------------------ src/patches/ccache-3.1-no_compiler_mtime.patch | 21 ++++++++++++++++++++ 4 files changed, 28 insertions(+), 25 deletions(-) delete mode 100644 src/patches/ccache-3.0pre0-no_compiler_mtime.patch create mode 100644 src/patches/ccache-3.1-no_compiler_mtime.patch

Difference in files: diff --git a/lfs/ccache b/lfs/ccache index 2fc0c3d..2407320 100644 --- a/lfs/ccache +++ b/lfs/ccache @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2010 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,13 +24,13 @@

include Config

-VER = 3.0pre0 +VER = 3.1

THISAPP = ccache-$(VER) DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP)-pass$(PASS)

############################################################################### # Top-level Rules @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 3704f1cd486b1e63638fd17910c42e9f +$(DL_FILE)_MD5 = 7961852e1e36f11559039c32142f58df

install : $(TARGET)

diff --git a/make.sh b/make.sh index cc2d3c5..a02dadb 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=2 +TOOLCHAINVER=1 IPFVER="full" # Which versions should be compiled? (full|devel)

# Debian specific settings @@ -231,7 +231,7 @@ buildtoolchain() { ORG_PATH=$PATH NATIVEGCC=`gcc --version | grep GCC | awk {'print $3'}` export NATIVEGCC GCCmajor=${NATIVEGCC:0:1} GCCminor=${NATIVEGCC:2:1} GCCrelease=${NATIVEGCC:4:1} - lfsmake1 ccache + lfsmake1 ccache PASS=1 lfsmake1 binutils PASS=1 lfsmake1 gcc PASS=1 export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH @@ -243,6 +243,7 @@ buildtoolchain() { lfsmake1 dejagnu lfsmake1 gcc PASS=2 lfsmake1 binutils PASS=2 + lfsmake1 ccache PASS=2 lfsmake1 ncurses lfsmake1 bash lfsmake1 bzip2 diff --git a/src/patches/ccache-3.0pre0-no_compiler_mtime.patch b/src/patches/ccache-3.0pre0-no_compiler_mtime.patch deleted file mode 100644 index 4bdc8d4..0000000 --- a/src/patches/ccache-3.0pre0-no_compiler_mtime.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur ccache-3.0pre0.org/ccache.c ccache-3.0pre0/ccache.c ---- ccache-3.0pre0.org/ccache.c 2010-02-28 21:14:39.000000000 +0100 -+++ ccache-3.0pre0/ccache.c 2010-03-22 08:08:43.000000000 +0100 -@@ -849,12 +849,14 @@ - - compilercheck = getenv("CCACHE_COMPILERCHECK"); - if (!compilercheck) { -- compilercheck = "mtime"; -+ compilercheck = "size"; - } - if (strcmp(compilercheck, "none") == 0) { - /* Do nothing. */ - } else if (strcmp(compilercheck, "content") == 0) { - hash_file(&hash, args->argv[0]); -+ } else if (strcmp(compilercheck, "size") == 0){ -+ hash_int(&hash, st.st_size); - } else { /* mtime */ - hash_int(&hash, st.st_size); - hash_int(&hash, st.st_mtime); diff --git a/src/patches/ccache-3.1-no_compiler_mtime.patch b/src/patches/ccache-3.1-no_compiler_mtime.patch new file mode 100644 index 0000000..fd921cd --- /dev/null +++ b/src/patches/ccache-3.1-no_compiler_mtime.patch @@ -0,0 +1,21 @@ +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);

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