summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--var/spack/repos/builtin/packages/xyce/454-cmake-xyce.patch (renamed from var/spack/repos/builtin/packages/xyce/454-oneapi-xyce.patch)13
-rw-r--r--var/spack/repos/builtin/packages/xyce/package.py15
2 files changed, 11 insertions, 17 deletions
diff --git a/var/spack/repos/builtin/packages/xyce/454-oneapi-xyce.patch b/var/spack/repos/builtin/packages/xyce/454-cmake-xyce.patch
index 19def5492c..66de579579 100644
--- a/var/spack/repos/builtin/packages/xyce/454-oneapi-xyce.patch
+++ b/var/spack/repos/builtin/packages/xyce/454-cmake-xyce.patch
@@ -1,16 +1,3 @@
-diff --git a/src/LinearAlgebraServicesPKG/ksparse/alloc.c b/src/LinearAlgebraServicesPKG/ksparse/alloc.c
-index 320878d7817273269e8805acaa9f6f7a252443f1..af40b7e800e5e8b573a69608aae49c324f2a0253 100644
---- a/src/LinearAlgebraServicesPKG/ksparse/alloc.c
-+++ b/src/LinearAlgebraServicesPKG/ksparse/alloc.c
-@@ -53,6 +53,7 @@ Copyright 1990 Regents of the University of California. All rights reserved.
- */
-
- void bye_bye(i)
-+ int i;
- {
- printf ("inv = %d\n",1/i);
- }
-
diff --git a/cmake/tps.cmake b/cmake/tps.cmake
index 3732758f6..b3f00bb7a 100644
--- a/cmake/tps.cmake
diff --git a/var/spack/repos/builtin/packages/xyce/package.py b/var/spack/repos/builtin/packages/xyce/package.py
index 743bc87085..8729a19da0 100644
--- a/var/spack/repos/builtin/packages/xyce/package.py
+++ b/var/spack/repos/builtin/packages/xyce/package.py
@@ -143,11 +143,18 @@ class Xyce(CMakePackage):
when="@7.4:7.6 +pymi",
)
- # fix oneapi issue
+ # fix missing type
patch(
- "454-oneapi-xyce.patch",
- sha256="76a3ff987e43d1657f24d55cfd864b487876a72a9a7c8a37c3151a9b586a21c1",
- when="%oneapi",
+ "https://github.com/Xyce/Xyce/commit/47d9dd04ec55cd8722cb3704a88beb228dfcf363.patch?full_index=1",
+ sha256="62c3d0c17b3225be5f61b6ec3d9cf762cc08bb20a80e768d87a37e87c522bbf1",
+ when="@:7.7",
+ )
+
+ # fix cmake trilinos test issue
+ patch(
+ "454-cmake-xyce.patch",
+ sha256="4d47cd1f10607205e64910ac124c6dd329f1ecbf861416e9da24a1736f2149ff",
+ when="@7.6:",
)
def cmake_args(self):