Merge pull request #25457 from cticenhour/remove-libmesh-bootstrap

Modify bootstrap at libMesh level for macOS ARM64
idaholab · Sep 15, 2023 · 4fc72f1 · 4fc72f1
2 parents 14e1da6 + 4ae4ba3
commit 4fc72f1
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 6 deletions.
diff --git a/conda/libmesh/meta.yaml b/conda/libmesh/meta.yaml
@@ -4,7 +4,7 @@
 #
 # As well as any directions pertaining to modifying those files.
 # ALSO: Follow the directions in scripts/tests/versioner_hashes.yaml
-{% set build = 0 %}
+{% set build = 1 %}
 {% set version = "2023.09.06" %}
 {% set vtk_friendly_version = "9.2" %}
 

diff --git a/conda/moose-dev/conda_build_config.yaml b/conda/moose-dev/conda_build_config.yaml
@@ -1,5 +1,5 @@
 moose_libmesh:
-  - moose-libmesh 2023.09.06 build_0
+  - moose-libmesh 2023.09.06 build_1
 
 moose_wasp:
   - moose-wasp 2023.08.31

diff --git a/conda/moose-dev/meta.yaml b/conda/moose-dev/meta.yaml
@@ -4,7 +4,7 @@
 #   template/conda_build_config.yaml
 #
 # As well as any directions pertaining to modifying those files.
-{% set version = "2023.09.06" %}
+{% set version = "2023.09.13" %}
 
 package:
   name: moose-dev

diff --git a/conda/moose/conda_build_config.yaml b/conda/moose/conda_build_config.yaml
@@ -1,5 +1,5 @@
 moose_dev:
-  - moose-dev 2023.09.06
+  - moose-dev 2023.09.13
 
 #### Darwin SDK SYSROOT
 CONDA_BUILD_SYSROOT:                                        # [osx]

diff --git a/conda/template/conda_build_config.yaml b/conda/template/conda_build_config.yaml
@@ -1,5 +1,5 @@
 moose_dev:
-  - moose-dev 2023.09.06
+  - moose-dev 2023.09.13
 
 #### Darwin SDK SYSROOT
 CONDA_BUILD_SYSROOT:                                        # [osx]

diff --git a/scripts/configure_libmesh.sh b/scripts/configure_libmesh.sh
@@ -47,7 +47,7 @@ function configure_libmesh()
   if [[ $(uname) == Darwin  ]] && [[ $(uname -m) == arm64 ]]; then
     echo "INFO: Re-bootstrapping libMesh and its dependencies"
     cd $SRC_DIR || exit $?
-    ./bootstrap || exit $?
+    autoreconf -fiv || exit $?
     cd contrib/metaphysicl || exit $?
     ./bootstrap || exit $?
     cd ../timpi || exit $?

diff --git a/scripts/tests/versioner_hashes.yaml b/scripts/tests/versioner_hashes.yaml
@@ -117,3 +117,9 @@ fa4c2347f80a3859d2bf68d92f52341331274f34: # 25370
   libmesh: 26585cd
   moose: fc4e3b7
   wasp: 76657f9
+f480c8e2b021faeaf15f0173dc96454bc0354a74: #25457
+  mpich: ac902f8
+  petsc: 9fe2e73
+  libmesh: ede12e5
+  moose: 6bc1745
+  wasp: 76657f9