hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

qhull: fix to work around a known issue of the library with intel compiler (#4648)

Browse source
This commit is contained in:
Massimiliano Culpo 2017-07-17 21:39:09 +02:00 committed by Adam J. Stewart
parent 2bf140601b
commit 6dcbc30a2c
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
var/spack/repos/builtin/packages/qhull/package.py
View file

@ -43,4 +43,6 @@ class Qhull(CMakePackage):
version('2012.1', 'd0f978c0d8dfb2e919caefa56ea2953c', version('2012.1', 'd0f978c0d8dfb2e919caefa56ea2953c',
url="http://www.qhull.org/download/qhull-2012.1-src.tgz") 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') depends_on('cmake@2.6:', type='build')

18
var/spack/repos/builtin/packages/qhull/qhull-unused-intel-17.02.patch Normal file
View file

@ -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) ********************/