zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
fix conflict with setuptools and cached pyc files
This commit is contained in:
Todd Gamblin 2015-12-22 09:19:57 -08:00
commit 100ada0ed6
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
var/spack/packages/python/package.py
View File

@ -35,7 +35,8 @@ def install(self, spec, prefix):
# Rest of install is pretty standard except setup.py needs to be able to read the CPPFLAGS # 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 # and LDFLAGS as it scans for the library and headers to build
configure("--prefix=%s" % prefix, configure_args= [
"--prefix=%s" % prefix,
"--with-threads", "--with-threads",
"--enable-shared", "--enable-shared",
"CPPFLAGS=-I%s/include -I%s/include -I%s/include -I%s/include -I%s/include -I%s/include" % ( "CPPFLAGS=-I%s/include -I%s/include -I%s/include -I%s/include -I%s/include -I%s/include" % (
@ -45,7 +46,11 @@ def install(self, spec, prefix):
"LDFLAGS=-L%s/lib -L%s/lib -L%s/lib -L%s/lib -L%s/lib -L%s/lib" % ( "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['openssl'].prefix, spec['bzip2'].prefix,
spec['readline'].prefix, spec['ncurses'].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()
make("install") make("install")
@ -112,7 +117,7 @@ def python_ignore(self, ext_pkg, args):
# Ignore pieces of setuptools installed by other packages. # Ignore pieces of setuptools installed by other packages.
if ext_pkg.name != 'py-setuptools': if ext_pkg.name != 'py-setuptools':
patterns.append(r'/site\.pyc?$') patterns.append(r'/site[^/]*\.pyc?$')
patterns.append(r'setuptools\.pth') patterns.append(r'setuptools\.pth')
patterns.append(r'bin/easy_install[^/]*$') patterns.append(r'bin/easy_install[^/]*$')
patterns.append(r'setuptools.*egg$') patterns.append(r'setuptools.*egg$')