Merge pull request #266 from LLNL/bugfix/python3-setuptools-conflict

fix conflict with setuptools and cached pyc files

1 files changed, 8 insertions, 3 deletions

diff --git a/var/spack/packages/python/package.py b/var/spack/packages/python/package.py
index 0da7f4ce89..eae2566b57 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")
 
@@ -112,7 +117,7 @@ class Python(Package):
 
         # Ignore pieces of setuptools installed by other packages.
         if ext_pkg.name != 'py-setuptools':
-            patterns.append(r'/site\.pyc?$')
+            patterns.append(r'/site[^/]*\.pyc?$')
             patterns.append(r'setuptools\.pth')
             patterns.append(r'bin/easy_install[^/]*$')
             patterns.append(r'setuptools.*egg$')