Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 22 Oct 2010 18:17:15 +0000 (20:17 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 22 Oct 2010 18:17:15 +0000 (20:17 +0200)
Conflicts:
src/paks/linux-pae/uninstall.sh

lfs/ccache
make.sh
src/patches/ccache-3.0pre0-no_compiler_mtime.patch [deleted file]
src/patches/ccache-3.1-no_compiler_mtime.patch [new file with mode: 0644]

index 2fc0c3d..2407320 100644 (file)
@@ -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        #
 
 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 (executable)
--- 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 (file)
index 4bdc8d4..0000000
+++ /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 (file)
index 0000000..fd921cd
--- /dev/null
@@ -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);