summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorGregory L. Lee <lee218@cab687.llnl.gov>2015-12-22 06:50:18 -0800
committerGregory L. Lee <lee218@cab687.llnl.gov>2015-12-22 06:50:18 -0800
commitd85a46380cd0b2b113c8e3de111298abff2dd24f (patch)
treeb436b296468d009e73bef039cc63fb455b7b729b /var
parentc3aaf005e2ec2844fa02a60414978692b67727a4 (diff)
downloadspack-d85a46380cd0b2b113c8e3de111298abff2dd24f.tar.gz
spack-d85a46380cd0b2b113c8e3de111298abff2dd24f.tar.bz2
spack-d85a46380cd0b2b113c8e3de111298abff2dd24f.tar.xz
spack-d85a46380cd0b2b113c8e3de111298abff2dd24f.zip
fix conflict with setuptools and cached pyc files
Diffstat (limited to 'var')
-rw-r--r--var/spack/packages/python/package.py10
1 files changed, 8 insertions, 2 deletions
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)