Flake8 and formatting changes
This commit is contained in:
parent
534e1cbf1b
commit
5fc20487e4
@ -44,7 +44,7 @@ class Cmake(Package):
|
|||||||
|
|
||||||
variant('curl', default=True, description='Build external curl library')
|
variant('curl', default=True, description='Build external curl library')
|
||||||
variant('expat', default=True, description='Build external expat library')
|
variant('expat', default=True, description='Build external expat library')
|
||||||
# variant('jsoncpp', default=True, description='Build external jsoncpp library')
|
# variant('jsoncpp', default=True, description='Build external jsoncpp library') # NOQA: ignore=E501
|
||||||
variant('zlib', default=True, description='Build external zlib library')
|
variant('zlib', default=True, description='Build external zlib library')
|
||||||
variant('bzip2', default=True, description='Build external bzip2 library')
|
variant('bzip2', default=True, description='Build external bzip2 library')
|
||||||
variant('xz', default=True, description='Build external lzma library')
|
variant('xz', default=True, description='Build external lzma library')
|
||||||
@ -88,7 +88,7 @@ def install(self, spec, prefix):
|
|||||||
# Consistency check
|
# Consistency check
|
||||||
self.validate(spec)
|
self.validate(spec)
|
||||||
|
|
||||||
def variant_to_bool(variant):
|
def variant_to_bool(variant):
|
||||||
return 'system' if variant in spec else 'no-system'
|
return 'system' if variant in spec else 'no-system'
|
||||||
|
|
||||||
# configure, build, install:
|
# configure, build, install:
|
||||||
|
@ -77,6 +77,7 @@ def variant_to_bool(variant):
|
|||||||
]
|
]
|
||||||
|
|
||||||
configure(*config_args)
|
configure(*config_args)
|
||||||
|
|
||||||
make()
|
make()
|
||||||
# make("check") # cannot build test suite with Intel compilers
|
# make('check') # cannot build test suite with Intel compilers
|
||||||
make("install")
|
make('install')
|
||||||
|
@ -45,14 +45,15 @@ class Libxml2(Package):
|
|||||||
|
|
||||||
def install(self, spec, prefix):
|
def install(self, spec, prefix):
|
||||||
if '+python' in spec:
|
if '+python' in spec:
|
||||||
python_args = ["--with-python=%s" % spec['python'].prefix,
|
python_args = [
|
||||||
"--with-python-install-dir=%s" % site_packages_dir]
|
'--with-python={0}'.format(spec['python'].prefix),
|
||||||
|
'--with-python-install-dir={0}'.format(site_packages_dir)
|
||||||
|
]
|
||||||
else:
|
else:
|
||||||
python_args = ["--without-python"]
|
python_args = ['--without-python']
|
||||||
|
|
||||||
configure("--prefix=%s" % prefix,
|
configure('--prefix={0}'.format(prefix), *python_args)
|
||||||
*python_args)
|
|
||||||
|
|
||||||
make()
|
make()
|
||||||
make("check")
|
make('check')
|
||||||
make("install")
|
make('install')
|
||||||
|
@ -38,7 +38,8 @@ class Nettle(Package):
|
|||||||
depends_on('gmp')
|
depends_on('gmp')
|
||||||
|
|
||||||
def install(self, spec, prefix):
|
def install(self, spec, prefix):
|
||||||
configure("--prefix=%s" % prefix)
|
configure('--prefix={0}'.format(prefix))
|
||||||
|
|
||||||
make()
|
make()
|
||||||
make("check")
|
make('check')
|
||||||
make("install")
|
make('install')
|
||||||
|
@ -37,7 +37,8 @@ class Xz(Package):
|
|||||||
version('5.2.2', 'f90c9a0c8b259aee2234c4e0d7fd70af')
|
version('5.2.2', 'f90c9a0c8b259aee2234c4e0d7fd70af')
|
||||||
|
|
||||||
def install(self, spec, prefix):
|
def install(self, spec, prefix):
|
||||||
configure("--prefix=%s" % prefix)
|
configure('--prefix={0}'.format(prefix))
|
||||||
|
|
||||||
make()
|
make()
|
||||||
make("check")
|
make('check')
|
||||||
make("install")
|
make('install')
|
||||||
|
@ -35,8 +35,8 @@ class Zlib(Package):
|
|||||||
version('1.2.8', '44d667c142d7cda120332623eab69f40')
|
version('1.2.8', '44d667c142d7cda120332623eab69f40')
|
||||||
|
|
||||||
def install(self, spec, prefix):
|
def install(self, spec, prefix):
|
||||||
configure("--prefix=%s" % prefix)
|
configure('--prefix={0}'.format(prefix))
|
||||||
|
|
||||||
make()
|
make()
|
||||||
make("test")
|
make('test')
|
||||||
make("install")
|
make('install')
|
||||||
|
Loading…
Reference in New Issue
Block a user