try autoreconf mpfr to build with macos

supermerill · Oct 15, 2024 · 97361d8 · 97361d8
1 parent 6d81beb
commit 97361d8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 18 deletions.
diff --git a/.github/workflows/ccpp_mac.yml b/.github/workflows/ccpp_mac.yml
@@ -13,19 +13,16 @@ jobs:
 
     runs-on: macos-12
 
+
     steps:
     - uses: actions/checkout@v3
     - name: check autoconf version
-      run: autoconf --version
-    - name: update automake for mpfr
       run: |
-        curl -O -L http://ftpmirror.gnu.org/automake/automake-1.16.5.tar.gz
-        tar -xzf automake-1.16.5.tar.gz
-        cd automake-*
-        ./configure
-        make
-        sudo make install
+        autoconf --version
         automake --version
+        glibtool --version
+        which autoreconf
+        ls /usr/local/bin
     - name: build deps & slicer
       run: ./BuildMacOS.sh -dsi
     - name: Upload artifact

diff --git a/.github/workflows/ccpp_mac_arm.yml b/.github/workflows/ccpp_mac_arm.yml
@@ -13,21 +13,16 @@ jobs:
 
     runs-on: macos-14
 
+
     steps:
     - uses: actions/checkout@v3
     - name: install autoconf
-      run: brew install autoconf
+      run: brew install autoconf automake libtool
     - name: check autoconf version
-      run: autoconf --version
-    - name: update automake for mpfr
       run: |
-        curl -O -L http://ftpmirror.gnu.org/automake/automake-1.16.5.tar.gz
-        tar -xzf automake-1.16.5.tar.gz
-        cd automake-*
-        ./configure
-        make
-        sudo make install
+        autoconf --version
         automake --version
+        glibtool --version
     - name: build deps & slicer
       run: ./BuildMacOS.sh -adsi
     - name: Upload artifact

diff --git a/deps/MPFR/MPFR.cmake b/deps/MPFR/MPFR.cmake
@@ -30,7 +30,7 @@ else ()
         URL_HASH SHA256=cf4f4b2d80abb79e820e78c8077b6725bbbb4e8f41896783c899087be0e94068
         DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/MPFR
         BUILD_IN_SOURCE ON
-        CONFIGURE_COMMAND env "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" ./configure ${_cross_compile_arg} --prefix=${DESTDIR}/usr/local --enable-shared=no --enable-static=yes --with-gmp=${DESTDIR}/usr/local ${_gmp_build_tgt}
+        CONFIGURE_COMMAND env "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" autoreconf -fi ${_cross_compile_arg} --prefix=${DESTDIR}/usr/local --enable-shared=no --enable-static=yes --with-gmp=${DESTDIR}/usr/local ${_gmp_build_tgt} COMMAND env "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" ./configure ${_cross_compile_arg} --prefix=${DESTDIR}/usr/local --enable-shared=no --enable-static=yes --with-gmp=${DESTDIR}/usr/local ${_gmp_build_tgt}
         BUILD_COMMAND make -j
         INSTALL_COMMAND make install
         ${_cmake_args_osx_arch}