summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-02-10 16:15:05 +0000
committerMichał Górny <mgorny@gentoo.org>2013-02-10 16:15:05 +0000
commit0ce0db5962c02d86578dc3831101d7adafcba798 (patch)
treeddc51bd45516b128e54df20fee8e597796e11242
parentBackport patch from upstream to fix recursive file indexing. (diff)
downloadgentoo-2-0ce0db5962c02d86578dc3831101d7adafcba798.tar.gz
gentoo-2-0ce0db5962c02d86578dc3831101d7adafcba798.tar.bz2
gentoo-2-0ce0db5962c02d86578dc3831101d7adafcba798.zip
Temporarily disable egg_info since it causes problems with installing scripts.
-rw-r--r--eclass/ChangeLog6
-rw-r--r--eclass/distutils-r1.eclass13
2 files changed, 12 insertions, 7 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index c2f401768fb2..30cc59e16b36 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.672 2013/02/10 11:44:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.673 2013/02/10 16:15:05 mgorny Exp $
+
+ 10 Feb 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+ Temporarily disable egg_info since it causes problems with installing
+ scripts.
10 Feb 2013; Michał Górny <mgorny@gentoo.org> +cmake-multilib.eclass:
Introduce cmake-utils wrapper eclass for multilib.
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 4434b1b84c8b..4a701df9b032 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.51 2013/02/10 11:41:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.52 2013/02/10 16:15:05 mgorny Exp $
# @ECLASS: distutils-r1
# @MAINTAINER:
@@ -216,11 +216,12 @@ esetup.py() {
fi
# if setuptools is used, adjust egg_info path as well
- if "${PYTHON:-python}" setup.py --help egg_info &>/dev/null; then
- add_args+=(
- egg_info --egg-base "${BUILD_DIR}"
- )
- fi
+ # (disabled since it causes build not to install scripts)
+# if "${PYTHON:-python}" setup.py --help egg_info &>/dev/null; then
+# add_args+=(
+# egg_info --egg-base "${BUILD_DIR}"
+# )
+# fi
add_args+=(
build