Update macOS CI actions to macOS 15.

enzo1982 · Jan 19, 2025 · 9f2fd7f · 9f2fd7f
1 parent 46258f6
commit 9f2fd7f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/.github/workflows/continuous-build-macos.yml b/.github/workflows/continuous-build-macos.yml
@@ -12,18 +12,18 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: macos-12
+          - os: macos-15
             target: 10.9
 
-          - os: macos-12
+          - os: macos-15
             target: 11.0
 
     runs-on: ${{ matrix.os }}
 
     steps:
       - name: Install dependencies
         run: |
-          brew install automake nasm yasm
+          brew install automake libtool nasm yasm
 
       - name: Import certificates
         uses: apple-actions/import-codesign-certs@v3

diff --git a/tools/build-codecs b/tools/build-codecs
@@ -43,6 +43,7 @@ elif [[ $uname == Darwin ]] && [[ $BUILD_ARM64 == True ]]; then
   cflags="$cflags -arch arm64 -mcpu=apple-m1"
   asflags="-arch arm64"
   ldflags="-Wl,-x -arch arm64"
+  cmakeflags="-DCMAKE_OSX_ARCHITECTURES=arm64"
   host="aarch64-apple-darwin20.1.0"
   arm64=true
 elif [[ $uname == Darwin ]]; then
@@ -53,6 +54,8 @@ elif [[ $uname == Darwin ]]; then
   fi
   asflags="-arch x86_64"
   ldflags="-Wl,-x -arch x86_64"
+  cmakeflags="-DCMAKE_OSX_ARCHITECTURES=x86_64"
+  host="x86_64-apple-darwin20.1.0"
   x86_64=true
 elif [[ $machine == *amd64* || $machine == *x86_64* ]] && [[ $BUILD_ARM64 != True ]] && [[ $BUILD_X86 != True ]] && [[ $uname != *MINGW* || $BUILD_X86_64 == True ]]; then
   cflags="$cflags -m64 -march=x86-64"
@@ -280,9 +283,9 @@ build () {
     fi
   elif [[ -f CMakeLists.txt ]]; then
     if [[ $uname == *MINGW* ]]; then
-      cmake . -G "MSYS Makefiles" $cmake_flags
+      cmake . -G "MSYS Makefiles" $cmakeflags $cmake_flags
     else
-      cmake . $cmake_flags
+      cmake . $cmakeflags $cmake_flags
     fi
   fi
   $MAKE $make_flags -j$jobs
@@ -555,6 +558,8 @@ for package in ${packages[@]}; do
     prepare="sed -i -e \"s/immintrin\.h/emmintrin.h/\" src/common.h"
     if [[ $uname == *MINGW* ]] && [[ $x86 == true ]]; then
       configure_exports="RC=\"windres -F pe-i386\""
+    elif [[ $uname == Darwin ]]; then
+      export LDFLAGS="$cflags $ldflags"
     fi
     configure_flags="--disable-external-libs --disable-mpeg --disable-alsa"
     build $libsndfile_location src/.libs/libsndfile$sharedinfix.$sharedext SndFile.$sharedext
@@ -577,6 +582,8 @@ for package in ${packages[@]}; do
       export LDFLAGS="$ldflags -lstdc++.static"
     elif [[ $uname == *MINGW* ]] && [[ $arm64 == true ]]; then
       export LDFLAGS="$ldflags -lclang_rt.builtins-aarch64"
+    elif [[ $uname == Darwin ]]; then
+      prepare="sed -i -e \"s/keep_private_externs/keep_private_externs $ldflags/\" configure"
     fi
     build $mp4v2_location .libs/libmp4v2$sharedinfix.$sharedext MP4v2.$sharedext