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

fix: py-pillow build_ext vs. install (#14666)

Browse Source 
Previously, the install stage would compile in things that were
disabled during the build_ext phase. This would also result in the
build pulling in locally installed versions of libraries that were
disabled. The install process doesn't honor the same command-line
flags that build_ext does, but does call build_ext again. Avoid the
whole issue by just writing the options to setup.cfg

Also, add the Imagemagick dependency for tests.
This commit is contained in:
Andrew W Elble 2020-01-30 15:42:48 -05:00 committed by GitHub
parent 7b2895109c
commit b072caadec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
var/spack/repos/builtin/packages/py-pillow/package.py
View File

@ -61,6 +61,7 @@ class PyPillow(PythonPackage):
depends_on('libwebp', when='+webp') depends_on('libwebp', when='+webp')
depends_on('libwebp+libwebpmux+libwebpdemux', when='+webpmux') depends_on('libwebp+libwebpmux+libwebpdemux', when='+webpmux')
depends_on('openjpeg', when='+jpeg2000') depends_on('openjpeg', when='+jpeg2000')
depends_on('imagemagick', type='test')
# Spack does not (yet) support these modes of building # Spack does not (yet) support these modes of building
# depends_on('libimagequant', when='+imagequant') # depends_on('libimagequant', when='+imagequant')
@ -86,21 +87,25 @@ def patch(self):
setup.filter('include_dirs = []', setup.filter('include_dirs = []',
'include_dirs = {0}'.format(include_dirs), string=True) 'include_dirs = {0}'.format(include_dirs), string=True)
def build_ext_args(self, spec, prefix): def variant_to_cfg(setup):
def variant_to_flag(variant): able = 'enable' if '+' + variant in self.spec else 'disable'
able = 'enable' if '+' + variant in spec else 'disable' return '{0}-{1}=1\n'.format(able, variant)
return '--{0}-{1}'.format(able, variant)
args = ['--enable-zlib', '--enable-jpeg'] with open('setup.cfg', 'a') as setup:
# Default backend
setup.write('[build_ext]\n')
setup.write('enable-zlib=1\n')
setup.write('enable-jpeg=1\n')
variants = ['tiff', 'freetype', 'lcms', 'webp',
'webpmux', 'jpeg2000']
for variant in variants:
setup.write(variant_to_cfg(setup))
variants = ['tiff', 'freetype', 'lcms', 'webp', 'webpmux', 'jpeg2000'] # Spack does not (yet) support these modes of building
args.extend(list(map(variant_to_flag, variants))) setup.write('disable-imagequant=1\n')
# Spack does not (yet) support these modes of building setup.write('rpath={0}\n'.format(':'.join(self.rpath)))
args.append('--disable-imagequant') setup.write('[install]\n')
args.append('--rpath={0}'.format(':'.join(self.rpath)))
return args
# Tests need to be re-added since `phases` was overridden # Tests need to be re-added since `phases` was overridden
run_after('build_ext')( run_after('build_ext')(