summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorGlenn Johnson <glenn-johnson@uiowa.edu>2020-01-28 15:03:13 -0600
committerAdam J. Stewart <ajstewart426@gmail.com>2020-01-28 15:03:13 -0600
commit0605fc155772d59c026a084e5dace6b7de360f0e (patch)
tree5d68e72efd7ac4ed1791c6c3d2d6e256b6f22f39 /var
parent94def872ee41ebfeb0736745d031b64304dc2983 (diff)
downloadspack-0605fc155772d59c026a084e5dace6b7de360f0e.tar.gz
spack-0605fc155772d59c026a084e5dace6b7de360f0e.tar.bz2
spack-0605fc155772d59c026a084e5dace6b7de360f0e.tar.xz
spack-0605fc155772d59c026a084e5dace6b7de360f0e.zip
Build graphite2 with Intel compiler (#14636)
This PR sets the definition of REGPARM when building with the Intel compiler.
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/graphite2/package.py2
-rw-r--r--var/spack/repos/builtin/packages/graphite2/regparm.patch11
2 files changed, 13 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/graphite2/package.py b/var/spack/repos/builtin/packages/graphite2/package.py
index 173eb10242..544f3a53d3 100644
--- a/var/spack/repos/builtin/packages/graphite2/package.py
+++ b/var/spack/repos/builtin/packages/graphite2/package.py
@@ -16,3 +16,5 @@ class Graphite2(CMakePackage):
url = "https://github.com/silnrsi/graphite/releases/download/1.3.13/graphite2-1.3.13.tgz"
version('1.3.13', sha256='dd63e169b0d3cf954b397c122551ab9343e0696fb2045e1b326db0202d875f06')
+
+ patch('regparm.patch')
diff --git a/var/spack/repos/builtin/packages/graphite2/regparm.patch b/var/spack/repos/builtin/packages/graphite2/regparm.patch
new file mode 100644
index 0000000000..0f6ca1ec48
--- /dev/null
+++ b/var/spack/repos/builtin/packages/graphite2/regparm.patch
@@ -0,0 +1,11 @@
+--- a/src/inc/Machine.h 2018-12-20 00:28:50.000000000 -0600
++++ b/src/inc/Machine.h 2020-01-26 19:15:29.965965418 -0600
+@@ -46,7 +46,7 @@
+ #endif
+ #else
+ #define HOT __attribute__((hot))
+-#if defined(__x86_64)
++#if defined(__x86_64) && !defined(__INTEL_COMPILER)
+ #define REGPARM(n) __attribute__((hot, regparm(n)))
+ #else
+ #define REGPARM(n)