Merge pull request #27229 from cticenhour/seacas-mar-2024

Update seacas to 2024-03-11
idaholab · Mar 29, 2024 · ad6651e · ad6651e
2 parents abd38c4 + 80f89a8
commit ad6651e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/conda/seacas/arm-kern-return.patch b/conda/seacas/arm-kern-return.patch
@@ -0,0 +1,17 @@
+diff --git a/packages/seacas/libraries/ioss/src/Ioss_MemoryUtils.C b/packages/seacas/libraries/ioss/src/Ioss_MemoryUtils.C
+index b8aac6060..21dd95f5d 100644
+--- a/packages/seacas/libraries/ioss/src/Ioss_MemoryUtils.C
++++ b/packages/seacas/libraries/ioss/src/Ioss_MemoryUtils.C
+@@ -14,8 +14,11 @@
+ #include <sys/resource.h>
+ #include <unistd.h>
+
+-#if defined(__APPLE__) && defined(__MACH__)
++#if defined(__APPLE__) && defined(__MACH__) && (defined(__arm__) || defined(__arm64__))
+ #include <mach/arm/kern_return.h>
++#endif
++
++#if defined(__APPLE__) && defined(__MACH__)
+ #include <mach/kern_return.h>
+ #include <mach/mach_init.h>
+ #include <mach/message.h>
diff --git a/conda/seacas/meta.yaml b/conda/seacas/meta.yaml
@@ -1,7 +1,7 @@
 # MAKE SURE THAT seacas_version and seacas_git_rev match if performing a version update!
 {% set build = "0" %}
-{% set seacas_version = "2023.10.24" %}
-{% set seacas_git_rev = "v2023-10-24" %}
+{% set seacas_version = "2024.03.11" %}
+{% set seacas_git_rev = "v2024-03-11" %}
 {% set strbuild = "build_" + build|string %}
 
 package:
@@ -11,6 +11,8 @@ package:
 source:
   git_url: https://github.com/sandialabs/seacas
   git_rev: {{ seacas_git_rev }}
+  patches:
+    - arm-kern-return.patch
 
 build:
   number: {{ build }}