Revision: 5318
http://ipcop.svn.sourceforge.net/ipcop/?rev=5318&view=rev
Author: gespinasse
Date: 2011-01-09 21:38:00 +0000 (Sun, 09 Jan 2011)
Log Message:
-----------
For now, just revert with CCACHE value passed into the chroot and restore the
patch
Modified Paths:
--------------
ipcop/trunk/lfs/ccache
ipcop/trunk/make.sh
Added Paths:
-----------
ipcop/trunk/src/patches/ccache-null-cache_prefix.patch
Modified: ipcop/trunk/lfs/ccache
===================================================================
--- ipcop/trunk/lfs/ccache 2011-01-09 16:03:25 UTC (rev 5317)
+++ ipcop/trunk/lfs/ccache 2011-01-09 21:38:00 UTC (rev 5318)
@@ -84,6 +84,7 @@
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np0 -i $(DIR_PATCHES)/$(THISAPP).patch
+ cd $(DIR_APP) && patch -Np0 -i
$(DIR_PATCHES)/ccache-null-cache_prefix.patch
cd $(DIR_APP) && CFLAGS="-O2 -static" ./configure --prefix=$(PREFIX)
cd $(DIR_APP) && make
cd $(DIR_APP) && make install
Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh 2011-01-09 16:03:25 UTC (rev 5317)
+++ ipcop/trunk/make.sh 2011-01-09 21:38:00 UTC (rev 5318)
@@ -1334,6 +1334,10 @@
NAME=${NAME} \
SNAME=${SNAME} \
SLOGAN="${SLOGAN}" \
+ CCACHE_DIR=/usr/src/ccache \
+ CCACHE_PREFIX=${CCACHE_PREFIX} \
+ CCACHE_HASHDIR=${CCACHE_HASHDIR} \
+ DISTCC_DIR=/usr/src/distcc \
PARALLELISM=${PARALLELISM} \
LINKER=${LINKER} \
TOOLS_DIR=${TOOLS_DIR} \
@@ -1513,6 +1517,10 @@
NAME=${NAME} \
SNAME=${SNAME} \
SLOGAN="${SLOGAN}" \
+ CCACHE_DIR=/usr/src/ccache \
+ CCACHE_PREFIX=${CCACHE_PREFIX} \
+ CCACHE_HASHDIR=${CCACHE_HASHDIR} \
+ DISTCC_DIR=/usr/src/distcc \
PARALLELISM=${PARALLELISM} \
PASS=${PASS} \
TARGET_TGT=${TARGET_TGT} \
Added: ipcop/trunk/src/patches/ccache-null-cache_prefix.patch
===================================================================
--- ipcop/trunk/src/patches/ccache-null-cache_prefix.patch
(rev 0)
+++ ipcop/trunk/src/patches/ccache-null-cache_prefix.patch 2011-01-09
21:38:00 UTC (rev 5318)
@@ -0,0 +1,20 @@
+--- ccache.c 2004-09-13 11:38:30.000000000 +0100
++++ ccache.c 2007-04-25 22:34:05.000000000 +0100
+@@ -113,7 +113,7 @@
+ /* strip any local args */
+ args_strip(orig_args, "--ccache-");
+
+- if ((e=getenv("CCACHE_PREFIX"))) {
++ if ((e=getenv("CCACHE_PREFIX")) && *e != '\0') {
+ char *p = find_executable(e, MYNAME);
+ if (!p) {
+ perror(e);
+@@ -821,7 +821,7 @@
+ failed();
+ }
+
+- if ((e=getenv("CCACHE_PREFIX"))) {
++ if ((e=getenv("CCACHE_PREFIX")) && *e != '\0') {
+ char *p = find_executable(e, MYNAME);
+ if (!p) {
+ perror(e);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
