From c3733771e4324ba5eec5deaeef0bb93648af5212 Mon Sep 17 00:00:00 2001 From: "Kelly (KT) Thompson" Date: Thu, 22 Apr 2021 12:10:12 -0600 Subject: Update patchfile to allow xl+cuda builds. (#23201) --- .../repos/builtin/packages/random123/v1132-xl161.patch | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'var') 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" -- cgit v1.2.3-70-g09d2