[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog distutils-r1.eclass

[Michal Gorny (mgorny)]

mgorny      13/03/02 07:16:43

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Override build locations and set PYTHONPATH in in-source builds, to increase compatibility with out-of-source builds.

Revision  Changes    Path
1.697                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.697&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.697&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.696&r2=1.697

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.696
retrieving revision 1.697
diff -u -r1.696 -r1.697
--- ChangeLog	2 Mar 2013 07:13:32 -0000	1.696
+++ ChangeLog	2 Mar 2013 07:16:43 -0000	1.697
@@ -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.696 2013/03/02 07:13:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.697 2013/03/02 07:16:43 mgorny Exp $
+
+  02 Mar 2013; Michał Górny <mgorny@g.o> distutils-r1.eclass:
+  Override build locations and set PYTHONPATH in in-source builds, to increase
+  compatibility with out-of-source builds.
 
   02 Mar 2013; Michał Górny <mgorny@g.o> distutils-r1.eclass:
   In-source builds: append "build/" subdir to the BUILD_DIR variable. It can be



1.59                 eclass/distutils-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.59&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.59&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?r1=1.58&r2=1.59

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- distutils-r1.eclass	2 Mar 2013 07:13:32 -0000	1.58
+++ distutils-r1.eclass	2 Mar 2013 07:16:43 -0000	1.59
@@ -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.58 2013/03/02 07:13:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.59 2013/03/02 07:16:43 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -228,11 +228,7 @@
 	debug-print-function ${FUNCNAME} "${@}"
 
 	local add_args=()
-	if [[ ! ${DISTUTILS_IN_SOURCE_BUILD} ]]; then
-		if [[ ! ${BUILD_DIR} ]]; then
-			die 'Out-of-source build requested, yet BUILD_DIR unset.'
-		fi
-
+	if [[ ${BUILD_DIR} ]]; then
 		# if setuptools is used, adjust egg_info path as well
 		# (disabled since it causes build not to install scripts)
 #		if "${PYTHON:-python}" setup.py --help egg_info &>/dev/null; then
@@ -249,6 +245,8 @@
 			# make the ebuild writer lives easier
 			--build-scripts "${BUILD_DIR}/scripts"
 		)
+	elif [[ ! ${DISTUTILS_IN_SOURCE_BUILD} ]]; then
+		die 'Out-of-source build requested, yet BUILD_DIR unset.'
 	fi
 
 	set -- "${PYTHON:-python}" setup.py \
@@ -546,10 +544,8 @@
 			pushd "${BUILD_DIR}" >/dev/null || die
 		fi
 		local BUILD_DIR=${BUILD_DIR}/build
-	else
-		local PYTHONPATH="${BUILD_DIR}/lib:${PYTHONPATH}"
-		export PYTHONPATH
 	fi
+	local -x PYTHONPATH="${BUILD_DIR}/lib:${PYTHONPATH}"
 
 	local TMPDIR=${T}/${EPYTHON}