summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/ebuild.sh29
-rw-r--r--pym/portage/__init__.py4
2 files changed, 2 insertions, 31 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 00600473b..01c9a0c37 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -495,32 +495,7 @@ econf() {
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 @@ econf() {
"$@" \
${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 \
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 4b9457ae9..4713d8830 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -4922,10 +4922,6 @@ def _prepare_features_dirs(mysettings):
"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"),