Merge pull request idaholab#21933 from loganharbour/autoconf_libmesh

Unify libmesh re-bootstrap for arm mac
milljm · Aug 25, 2022 · de5880a · de5880a
2 parents 52df555 + 9bf6c8c
commit de5880a
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 27 deletions.
diff --git a/conda/libmesh/build.sh b/conda/libmesh/build.sh
@@ -23,18 +23,6 @@ function sed_replace(){
     fi
 }
 
-# Bootstrap libmesh and it's contribs
-if [[ $target_platform == osx-arm64 ]]; then
-    ./bootstrap
-    cd contrib/metaphysicl
-    ./bootstrap
-    cd ../timpi
-    ./bootstrap
-    cd ../netcdf/netcdf*
-    autoreconf -f -i
-    cd ../../../
-fi
-
 mkdir -p build; cd build
 
 if [[ $(uname) == Darwin ]]; then

diff --git a/conda/libmesh/meta.yaml b/conda/libmesh/meta.yaml
@@ -2,7 +2,7 @@
 # REMEMBER TO UPDATE the .yaml files for the following packages:
 #   template/
 #   moose/
-{% set build = 0 %}
+{% set build = 1 %}
 {% set strbuild = "build_" + build|string %}
 {% set version = "2022.08.23" %}
 {% set vtk_friendly_version = "9.1" %}

diff --git a/conda/moose/conda_build_config.yaml b/conda/moose/conda_build_config.yaml
@@ -1,5 +1,5 @@
 moose_libmesh:
- - moose-libmesh 2022.08.23 build_0
+ - moose-libmesh 2022.08.23 build_1
 
 moose_python:
  - python 3.9

diff --git a/conda/template/conda_build_config.yaml b/conda/template/conda_build_config.yaml
@@ -1,5 +1,5 @@
 moose_libmesh:
- - moose-libmesh 2022.08.23 build_0
+ - moose-libmesh 2022.08.23 build_1
 
 moose_python:
  - python 3.9

diff --git a/scripts/configure_libmesh.sh b/scripts/configure_libmesh.sh
@@ -41,6 +41,21 @@ function configure_libmesh()
   # If METHODS is not set in update_and_rebuild_libmesh.sh, set a default value.
   export METHODS=${METHODS:="opt oprof devel dbg"}
 
+  # On ARM Mac, we need to re-bootstrap because the current autotools
+  # in libMesh don't work with arm64 :(
+  # Roy is working on an autotools update eventually...
+  if [[ $(uname) == Darwin  ]] && [[ $(uname -m) == arm64 ]]; then
+    echo "INFO: Re-bootstrapping libMesh and its dependencies"
+    cd $SRC_DIR || exit $?
+    ./bootstrap || exit $?
+    cd contrib/metaphysicl || exit $?
+    ./bootstrap || exit $?
+    cd ../timpi || exit $?
+    ./bootstrap || exit $?
+    cd ../netcdf/netcdf* || exit $?
+    autoreconf -f -i || exit $?
+  fi
+
   cd ${SRC_DIR}/build
   ../configure --enable-silent-rules \
                --enable-unique-id \

diff --git a/scripts/update_and_rebuild_libmesh.sh b/scripts/update_and_rebuild_libmesh.sh
@@ -146,18 +146,6 @@ if [ -z "$PETSC_DIR" ]; then
   fi
 fi
 
-# If on osx-arm64, bootstrap libmesh and its contribs
-if [[ $(uname) == Darwin  ]] && [[ $(uname -m) == arm64 ]]; then
-    ./bootstrap
-    cd contrib/metaphysicl
-    ./bootstrap
-    cd ../timpi
-    ./bootstrap
-    cd ../netcdf/netcdf*
-    autoreconf
-    cd ../../../
-fi
-
 # If we're not going fast, remove the build directory and reconfigure
 if [ -z "$go_fast" ]; then
   if [[ -n "$LIBMESH_BUILD_DIR" ]]; then