From 2dac16be6d8082be42b71e4804fedf615ed8550b Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Sun, 10 Feb 2013 11:39:42 +0000 Subject: Override egg-info write location in out-of-source builds. --- eclass/ChangeLog | 5 ++++- eclass/distutils-r1.eclass | 9 ++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'eclass') diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 9666cd046e62..4245f077883f 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.667 2013/02/10 11:38:17 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.668 2013/02/10 11:39:42 mgorny Exp $ + + 10 Feb 2013; Michał Górny distutils-r1.eclass: + Override egg-info write location in out-of-source builds. 10 Feb 2013; Michał Górny distutils-r1.eclass: Error out if "tests" package is installed. This is a common mistake and a diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 043fe1b0c2da..ec7171b8a624 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.49 2013/02/10 11:38:17 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.50 2013/02/10 11:39:42 mgorny Exp $ # @ECLASS: distutils-r1 # @MAINTAINER: @@ -215,6 +215,13 @@ esetup.py() { die 'Out-of-source build requested, yet BUILD_DIR unset.' 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 + add_args+=( build --build-base "${BUILD_DIR}" -- cgit v1.2.3-65-gdbad