| 1 |
Author: zmedico |
| 2 |
Date: 2008-11-01 02:52:44 +0000 (Sat, 01 Nov 2008) |
| 3 |
New Revision: 11770 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/bin/ebuild.sh |
| 7 |
main/trunk/pym/portage/__init__.py |
| 8 |
Log: |
| 9 |
Bug #244792 - Remove confcache support. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/bin/ebuild.sh |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/bin/ebuild.sh 2008-11-01 02:43:56 UTC (rev 11769) |
| 15 |
+++ main/trunk/bin/ebuild.sh 2008-11-01 02:52:44 UTC (rev 11770) |
| 16 |
@@ -495,32 +495,7 @@ |
| 17 |
LOCAL_EXTRA_ECONF="--libdir=${CONF_LIBDIR_RESULT} ${LOCAL_EXTRA_ECONF}" |
| 18 |
fi |
| 19 |
|
| 20 |
- local TMP_CONFCACHE_DIR CONFCACHE_ARG |
| 21 |
- if hasq confcache $FEATURES && ! hasq confcache $RESTRICT; then |
| 22 |
- CONFCACHE="$(type -P confcache)" |
| 23 |
- if [ -z "${CONFCACHE}" ]; then |
| 24 |
- ewarn "disabling confcache, binary cannot be found" |
| 25 |
- else |
| 26 |
- CONFCACHE="${CONFCACHE/ /\ }" |
| 27 |
- TMP_CONFCACHE_DIR="${CONFCACHE:+${CONFCACHE_DIR:-${PORTAGE_TMPDIR}/confcache}}" |
| 28 |
- TMP_CONFCACHE_DIR="${TMP_CONFCACHE_DIR/ /\ }" |
| 29 |
- CONFCACHE_ARG="--confcache-dir" |
| 30 |
- local s |
| 31 |
- if [ -n "$CCACHE_DIR" ]; then |
| 32 |
- s="$CCACHE_DIR" |
| 33 |
- fi |
| 34 |
- if [ -n "$DISTCC_DIR" ]; then |
| 35 |
- s="${s:+${s}:}$DISTCC_DIR" |
| 36 |
- fi |
| 37 |
- if [ -n "$s" ]; then |
| 38 |
- CONFCACHE_ARG="--confcache-ignore $s $CONFCACHE_ARG" |
| 39 |
- fi |
| 40 |
- fi |
| 41 |
- else |
| 42 |
- CONFCACHE= |
| 43 |
- fi |
| 44 |
- |
| 45 |
- vecho ${CONFCACHE} ${CONFCACHE_ARG} ${TMP_CONFCACHE_DIR} "${ECONF_SOURCE}/configure" \ |
| 46 |
+ vecho "${ECONF_SOURCE}/configure" \ |
| 47 |
--prefix=/usr \ |
| 48 |
--host=${CHOST} \ |
| 49 |
--mandir=/usr/share/man \ |
| 50 |
@@ -531,7 +506,7 @@ |
| 51 |
"$@" \ |
| 52 |
${LOCAL_EXTRA_ECONF} |
| 53 |
|
| 54 |
- if ! ${CONFCACHE} ${CONFCACHE_ARG} ${TMP_CONFCACHE_DIR} "${ECONF_SOURCE}/configure" \ |
| 55 |
+ if ! "${ECONF_SOURCE}/configure" \ |
| 56 |
--prefix=/usr \ |
| 57 |
--host=${CHOST} \ |
| 58 |
--mandir=/usr/share/man \ |
| 59 |
|
| 60 |
Modified: main/trunk/pym/portage/__init__.py |
| 61 |
=================================================================== |
| 62 |
--- main/trunk/pym/portage/__init__.py 2008-11-01 02:43:56 UTC (rev 11769) |
| 63 |
+++ main/trunk/pym/portage/__init__.py 2008-11-01 02:52:44 UTC (rev 11770) |
| 64 |
@@ -4922,10 +4922,6 @@ |
| 65 |
"basedir_var":"CCACHE_DIR", |
| 66 |
"default_dir":os.path.join(mysettings["PORTAGE_TMPDIR"], "ccache"), |
| 67 |
"always_recurse":False}, |
| 68 |
- "confcache":{ |
| 69 |
- "basedir_var":"CONFCACHE_DIR", |
| 70 |
- "default_dir":os.path.join(mysettings["PORTAGE_TMPDIR"], "confcache"), |
| 71 |
- "always_recurse":False}, |
| 72 |
"distcc":{ |
| 73 |
"basedir_var":"DISTCC_DIR", |
| 74 |
"default_dir":os.path.join(mysettings["BUILD_PREFIX"], ".distcc"), |
Archives