From d85a46380cd0b2b113c8e3de111298abff2dd24f Mon Sep 17 00:00:00 2001 From: "Gregory L. Lee" Date: Tue, 22 Dec 2015 06:50:18 -0800 Subject: fix conflict with setuptools and cached pyc files --- var/spack/packages/python/package.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/packages/python/package.py b/var/spack/packages/python/package.py index 30e6ef6bb8..2213244d6d 100644 --- a/var/spack/packages/python/package.py +++ b/var/spack/packages/python/package.py @@ -35,7 +35,8 @@ class Python(Package): # Rest of install is pretty standard except setup.py needs to be able to read the CPPFLAGS # and LDFLAGS as it scans for the library and headers to build - configure("--prefix=%s" % prefix, + configure_args= [ + "--prefix=%s" % prefix, "--with-threads", "--enable-shared", "CPPFLAGS=-I%s/include -I%s/include -I%s/include -I%s/include -I%s/include -I%s/include" % ( @@ -45,7 +46,11 @@ class Python(Package): "LDFLAGS=-L%s/lib -L%s/lib -L%s/lib -L%s/lib -L%s/lib -L%s/lib" % ( spec['openssl'].prefix, spec['bzip2'].prefix, spec['readline'].prefix, spec['ncurses'].prefix, - spec['sqlite'].prefix, spec['zlib'].prefix)) + spec['sqlite'].prefix, spec['zlib'].prefix) + ] + if spec.satisfies('@3:'): + configure_args.append('--without-ensurepip') + configure(*configure_args) make() make("install") @@ -116,6 +121,7 @@ class Python(Package): patterns.append(r'setuptools\.pth') patterns.append(r'bin/easy_install[^/]*$') patterns.append(r'setuptools.*egg$') + patterns.append(r'__pycache__/.*.pyc$') return match_predicate(ignore_arg, patterns) -- cgit v1.2.3-60-g2f50