* [gentoo-commits] portage r11770 - in main/trunk: bin pym/portage
@ 2008-11-01 2:52 Zac Medico (zmedico)
0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2008-11-01 2:52 UTC (permalink / raw
To: gentoo-commits
Author: zmedico
Date: 2008-11-01 02:52:44 +0000 (Sat, 01 Nov 2008)
New Revision: 11770
Modified:
main/trunk/bin/ebuild.sh
main/trunk/pym/portage/__init__.py
Log:
Bug #244792 - Remove confcache support.
Modified: main/trunk/bin/ebuild.sh
===================================================================
--- main/trunk/bin/ebuild.sh 2008-11-01 02:43:56 UTC (rev 11769)
+++ main/trunk/bin/ebuild.sh 2008-11-01 02:52:44 UTC (rev 11770)
@@ -495,32 +495,7 @@
LOCAL_EXTRA_ECONF="--libdir=${CONF_LIBDIR_RESULT} ${LOCAL_EXTRA_ECONF}"
fi
- local TMP_CONFCACHE_DIR CONFCACHE_ARG
- if hasq confcache $FEATURES && ! hasq confcache $RESTRICT; then
- CONFCACHE="$(type -P confcache)"
- if [ -z "${CONFCACHE}" ]; then
- ewarn "disabling confcache, binary cannot be found"
- else
- CONFCACHE="${CONFCACHE/ /\ }"
- TMP_CONFCACHE_DIR="${CONFCACHE:+${CONFCACHE_DIR:-${PORTAGE_TMPDIR}/confcache}}"
- TMP_CONFCACHE_DIR="${TMP_CONFCACHE_DIR/ /\ }"
- CONFCACHE_ARG="--confcache-dir"
- local s
- if [ -n "$CCACHE_DIR" ]; then
- s="$CCACHE_DIR"
- fi
- if [ -n "$DISTCC_DIR" ]; then
- s="${s:+${s}:}$DISTCC_DIR"
- fi
- if [ -n "$s" ]; then
- CONFCACHE_ARG="--confcache-ignore $s $CONFCACHE_ARG"
- fi
- fi
- else
- CONFCACHE=
- fi
-
- vecho ${CONFCACHE} ${CONFCACHE_ARG} ${TMP_CONFCACHE_DIR} "${ECONF_SOURCE}/configure" \
+ vecho "${ECONF_SOURCE}/configure" \
--prefix=/usr \
--host=${CHOST} \
--mandir=/usr/share/man \
@@ -531,7 +506,7 @@
"$@" \
${LOCAL_EXTRA_ECONF}
- if ! ${CONFCACHE} ${CONFCACHE_ARG} ${TMP_CONFCACHE_DIR} "${ECONF_SOURCE}/configure" \
+ if ! "${ECONF_SOURCE}/configure" \
--prefix=/usr \
--host=${CHOST} \
--mandir=/usr/share/man \
Modified: main/trunk/pym/portage/__init__.py
===================================================================
--- main/trunk/pym/portage/__init__.py 2008-11-01 02:43:56 UTC (rev 11769)
+++ main/trunk/pym/portage/__init__.py 2008-11-01 02:52:44 UTC (rev 11770)
@@ -4922,10 +4922,6 @@
"basedir_var":"CCACHE_DIR",
"default_dir":os.path.join(mysettings["PORTAGE_TMPDIR"], "ccache"),
"always_recurse":False},
- "confcache":{
- "basedir_var":"CONFCACHE_DIR",
- "default_dir":os.path.join(mysettings["PORTAGE_TMPDIR"], "confcache"),
- "always_recurse":False},
"distcc":{
"basedir_var":"DISTCC_DIR",
"default_dir":os.path.join(mysettings["BUILD_PREFIX"], ".distcc"),
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-11-01 2:52 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-01 2:52 [gentoo-commits] portage r11770 - in main/trunk: bin pym/portage Zac Medico (zmedico)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox