Fixed linking of R with MKL + configure issue in a dep (pixman) (#8449)
This commit is contained in:
parent
8e3d49cf35
commit
d5e8cabe75
@ -47,6 +47,25 @@ class Pixman(AutotoolsPackage):
|
|||||||
# Patch is obtained from above link.
|
# Patch is obtained from above link.
|
||||||
patch('clang.patch', when='%clang@9.1.0-apple:')
|
patch('clang.patch', when='%clang@9.1.0-apple:')
|
||||||
|
|
||||||
|
@run_before('build')
|
||||||
|
def patch_config_h_for_intel(self):
|
||||||
|
config_h = join_path(self.stage.source_path, 'config.h')
|
||||||
|
|
||||||
|
# Intel disguises itself as GNU, but doesn't implement
|
||||||
|
# the same builtin functions. This causes in this case
|
||||||
|
# a positive detection of GCC vector extensions, which
|
||||||
|
# is bound to fail at compile time because Intel has no
|
||||||
|
# __builtin_shuffle. See also:
|
||||||
|
#
|
||||||
|
# https://software.intel.com/en-us/forums/intel-c-compiler/topic/758013
|
||||||
|
#
|
||||||
|
if '%intel' in self.spec:
|
||||||
|
filter_file(
|
||||||
|
'#define HAVE_GCC_VECTOR_EXTENSIONS /\*\*/',
|
||||||
|
'/* #undef HAVE_GCC_VECTOR_EXTENSIONS */',
|
||||||
|
config_h
|
||||||
|
)
|
||||||
|
|
||||||
def configure_args(self):
|
def configure_args(self):
|
||||||
args = [
|
args = [
|
||||||
'--enable-libpng',
|
'--enable-libpng',
|
||||||
|
@ -119,7 +119,7 @@ def configure_args(self):
|
|||||||
|
|
||||||
if '+external-lapack' in spec:
|
if '+external-lapack' in spec:
|
||||||
config_args.extend([
|
config_args.extend([
|
||||||
'--with-blas',
|
'--with-blas={0}'.format(spec['blas'].libs),
|
||||||
'--with-lapack'
|
'--with-lapack'
|
||||||
])
|
])
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user