diff --git a/.github/actions/deploy-macosx/action.yml b/.github/actions/deploy-macosx/action.yml index 879f10fa88..f03e99edee 100644 --- a/.github/actions/deploy-macosx/action.yml +++ b/.github/actions/deploy-macosx/action.yml @@ -25,7 +25,7 @@ runs: fi brew uninstall --force --ignore-dependencies gcc gcc@7 gcc@8 gcc@9 gcc@10 gcc@11 gcc@12 gcc@13 gcc@14 little-cms2 maven openblas r - brew install boost ccache swig autoconf-archive automake cmake libomp libtool libusb ant nasm xz pkg-config sdl2 gpg1 bison flex perl ragel binutils gradle gmp isl libmpc mpfr geoip pcre ssdeep yajl + brew install --overwrite boost ccache swig autoconf-archive automake cmake libomp libtool libusb ant nasm xz pkg-config sdl2 gpg1 bison flex perl ragel binutils gradle gmp isl libmpc mpfr pcre ssdeep yajl # echo Installing an older less buggy version of CMake # curl -LO https://raw.githubusercontent.com/Homebrew/homebrew-core/30a3e5e02420a515f9bad02e3cfcde95316db529/Formula/cmake.rb diff --git a/.github/workflows/openblas.yml b/.github/workflows/openblas.yml index 038cd6e3ad..4eb8cefec3 100644 --- a/.github/workflows/openblas.yml +++ b/.github/workflows/openblas.yml @@ -63,7 +63,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-arm64: - runs-on: macos-13 + runs-on: macos-14 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions macosx-x86_64: diff --git a/arpack-ng/cppbuild.sh b/arpack-ng/cppbuild.sh index 868fcd6af3..f8b4c1fb8d 100755 --- a/arpack-ng/cppbuild.sh +++ b/arpack-ng/cppbuild.sh @@ -87,7 +87,7 @@ case $PLATFORM in sed -i="" 's/install_name \\$rpath/install_name @rpath/g' configure m4/libtool.m4 export CC="$(compgen -cX '!gcc*')" export CXX="$(compgen -cX '!g++*')" - export FC="$(compgen -cX '!gfortran*') -Wl,-rpath,@loader_path/" + export FC="$(compgen -cX '!gfortran*') -Wl,-rpath,@loader_path/ -Wl,-rpath,$(ls -1d /opt/homebrew/opt/gcc*/lib/gcc/*/ | head -n 1)" export F77="$FC" export FLIBS="-lgfortran" ./configure --prefix=$INSTALL_PATH --enable-icb --with-blas=openblas --with-lapack=openblas