diff options
| author | Massimiliano Culpo <massimiliano.culpo@googlemail.com> | 2017-07-17 21:39:09 +0200 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2017-07-17 14:39:09 -0500 |
| commit | 6dcbc30a2cbdc7a159776757ce6f7997ab7ad943 (patch) | |
| tree | 80b8f9bdde8fa986f5e908200992ae166f4f41bc | |
| parent | 2bf140601b3f5ccbe2c0a70ed6740209971392c5 (diff) | |
| download | spack-6dcbc30a2cbdc7a159776757ce6f7997ab7ad943.tar.gz spack-6dcbc30a2cbdc7a159776757ce6f7997ab7ad943.tar.bz2 spack-6dcbc30a2cbdc7a159776757ce6f7997ab7ad943.tar.xz spack-6dcbc30a2cbdc7a159776757ce6f7997ab7ad943.zip | |
qhull: fix to work around a known issue of the library with intel compiler (#4648)
| -rw-r--r-- | var/spack/repos/builtin/packages/qhull/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/qhull/qhull-unused-intel-17.02.patch | 18 |
2 files changed, 20 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/qhull/package.py b/var/spack/repos/builtin/packages/qhull/package.py index 308b0521fa..aaad704d66 100644 --- a/var/spack/repos/builtin/packages/qhull/package.py +++ b/var/spack/repos/builtin/packages/qhull/package.py @@ -43,4 +43,6 @@ class Qhull(CMakePackage): version('2012.1', 'd0f978c0d8dfb2e919caefa56ea2953c', url="http://www.qhull.org/download/qhull-2012.1-src.tgz") + patch('qhull-unused-intel-17.02.patch', when='@2015.2') + depends_on('cmake@2.6:', type='build') diff --git a/var/spack/repos/builtin/packages/qhull/qhull-unused-intel-17.02.patch b/var/spack/repos/builtin/packages/qhull/qhull-unused-intel-17.02.patch new file mode 100644 index 0000000000..70eb3bd722 --- /dev/null +++ b/var/spack/repos/builtin/packages/qhull/qhull-unused-intel-17.02.patch @@ -0,0 +1,18 @@ +--- a/src/libqhull_r/qhull_ra.h 2017-06-30 14:24:52.252635925 +0200 ++++ b/src/libqhull_r/qhull_ra.h 2017-06-30 14:25:27.356635296 +0200 +@@ -101,13 +101,8 @@ + + */ + +-#if defined(__cplusplus) && defined(__INTEL_COMPILER) && !defined(QHULL_OS_WIN) +-template <typename T> +-inline void qhullUnused(T &x) { (void)x; } +-# define QHULL_UNUSED(x) qhullUnused(x); +-#else +-# define QHULL_UNUSED(x) (void)x; +-#endif ++#define QHULL_UNUSED(x) (void)x; ++ + + /***** -libqhull_r.c prototypes (alphabetical after qhull) ********************/ + |