Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Spack
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
eic_tools
Spack
Commits
d5e8cabe
Commit
d5e8cabe
authored
6 years ago
by
Massimiliano Culpo
Committed by
Adam J. Stewart
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fixed linking of R with MKL + configure issue in a dep (pixman) (#8449)
parent
8e3d49cf
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
var/spack/repos/builtin/packages/pixman/package.py
+19
-0
19 additions, 0 deletions
var/spack/repos/builtin/packages/pixman/package.py
var/spack/repos/builtin/packages/r/package.py
+1
-1
1 addition, 1 deletion
var/spack/repos/builtin/packages/r/package.py
with
20 additions
and
1 deletion
var/spack/repos/builtin/packages/pixman/package.py
+
19
−
0
View file @
d5e8cabe
...
...
@@ -47,6 +47,25 @@ class Pixman(AutotoolsPackage):
# Patch is obtained from above link.
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
):
args
=
[
'
--enable-libpng
'
,
...
...
This diff is collapsed.
Click to expand it.
var/spack/repos/builtin/packages/r/package.py
+
1
−
1
View file @
d5e8cabe
...
...
@@ -119,7 +119,7 @@ def configure_args(self):
if
'
+external-lapack
'
in
spec
:
config_args
.
extend
([
'
--with-blas
'
,
'
--with-blas
={0}
'
.
format
(
spec
[
'
blas
'
].
libs
)
,
'
--with-lapack
'
])
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment