summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKelly (KT) Thompson <KineticTheory@users.noreply.github.com>2021-04-22 12:10:12 -0600
committerGitHub <noreply@github.com>2021-04-22 12:10:12 -0600
commitc3733771e4324ba5eec5deaeef0bb93648af5212 (patch)
treeeaf5dd5a39701e6161218f9e54791669f674bf10
parentb904e9aa1c4e46dc6860e2ad04ef84d3ac0296e0 (diff)
downloadspack-c3733771e4324ba5eec5deaeef0bb93648af5212.tar.gz
spack-c3733771e4324ba5eec5deaeef0bb93648af5212.tar.bz2
spack-c3733771e4324ba5eec5deaeef0bb93648af5212.tar.xz
spack-c3733771e4324ba5eec5deaeef0bb93648af5212.zip
Update patchfile to allow xl+cuda builds. (#23201)
-rw-r--r--var/spack/repos/builtin/packages/random123/v1132-xl161.patch17
1 files changed, 16 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/random123/v1132-xl161.patch b/var/spack/repos/builtin/packages/random123/v1132-xl161.patch
index 398de3cc2a..f4c66897aa 100644
--- a/var/spack/repos/builtin/packages/random123/v1132-xl161.patch
+++ b/var/spack/repos/builtin/packages/random123/v1132-xl161.patch
@@ -1,5 +1,5 @@
diff --git a/include/Random123/features/compilerfeatures.h b/include/Random123/features/compilerfeatures.h
-index 2341a7a..3c5d999 100644
+index 2341a7a..0606dee 100644
--- a/include/Random123/features/compilerfeatures.h
+++ b/include/Random123/features/compilerfeatures.h
@@ -206,7 +206,7 @@ added to each of the *features.h files, AND to examples/ut_features.cpp.
@@ -11,3 +11,18 @@ index 2341a7a..3c5d999 100644
#include "xlcfeatures.h"
#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
#include "sunprofeatures.h"
+diff --git a/include/Random123/features/nvccfeatures.h b/include/Random123/features/nvccfeatures.h
+index d1ff8bf..179298c 100644
+--- a/include/Random123/features/nvccfeatures.h
++++ b/include/Random123/features/nvccfeatures.h
+@@ -116,7 +116,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #define R123_ULONG_LONG unsigned long long
+ #endif
+
+-#if defined(__GNUC__)
++#if defined(__xlC__) || defined(__ibmxl__)
++#include "xlcfeatures.h"
++#elif defined(__GNUC__)
+ #include "gccfeatures.h"
+ #elif defined(_MSC_FULL_VER)
+ #include "msvcfeatures.h"