From a0af6f491030ae145c79d7c91316fc18abc095c1 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 7 Apr 2026 18:54:29 +0200 Subject: [PATCH 1/6] Fix ranlib confusion between xcode and AndroidNDK --- .cirrus.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index bc7fbdf77d..27545a9899 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -89,13 +89,14 @@ task: type: text/plain macos_instance: - image: ghcr.io/cirruslabs/macos-sonoma-xcode:latest + image: ghcr.io/cirruslabs/macos-tahoe-xcode:latest task: name: AppleM1/LLVM armv7-androidndk xbuild compile_script: - brew install --cask android-ndk - export ANDROID_NDK_HOME="/opt/homebrew/share/android-ndk" - export CC=/opt/homebrew/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/armv7a-linux-androideabi23-clang + - export RANLIB=touch - make TARGET=ARMV7 ARM_SOFTFP_ABI=1 NUM_THREADS=32 HOSTCC=clang NOFORTRAN=1 RANLIB="ls -l" always: config_artifacts: From e7ec708e166bbe30772fceb7f79ad0f6bf06e849 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 7 Apr 2026 19:43:47 +0200 Subject: [PATCH 2/6] Update .cirrus.yml --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 27545a9899..5e2b7afae7 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -97,7 +97,7 @@ task: - export ANDROID_NDK_HOME="/opt/homebrew/share/android-ndk" - export CC=/opt/homebrew/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/armv7a-linux-androideabi23-clang - export RANLIB=touch - - make TARGET=ARMV7 ARM_SOFTFP_ABI=1 NUM_THREADS=32 HOSTCC=clang NOFORTRAN=1 RANLIB="ls -l" + - make TARGET=ARMV7 ARM_SOFTFP_ABI=1 NUM_THREADS=32 HOSTCC=clang NOFORTRAN=1 always: config_artifacts: path: "*conf*" From f0630763655a5c9367328c7a610c045da3c66652 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 7 Apr 2026 20:06:09 +0200 Subject: [PATCH 3/6] Update .cirrus.yml --- .cirrus.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 5e2b7afae7..b3d5c53ca8 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -97,7 +97,9 @@ task: - export ANDROID_NDK_HOME="/opt/homebrew/share/android-ndk" - export CC=/opt/homebrew/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/armv7a-linux-androideabi23-clang - export RANLIB=touch - - make TARGET=ARMV7 ARM_SOFTFP_ABI=1 NUM_THREADS=32 HOSTCC=clang NOFORTRAN=1 + - which ar + - which ranlib + - make TARGET=ARMV7 ARM_SOFTFP_ABI=1 NUM_THREADS=32 HOSTCC=clang NOFORTRAN=1 AR=/usr/bin/ar always: config_artifacts: path: "*conf*" From c86d4163f7a0541c0de3567685c9198e35272656 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 7 Apr 2026 20:37:08 +0200 Subject: [PATCH 4/6] Update .cirrus.yml --- .cirrus.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.cirrus.yml b/.cirrus.yml index b3d5c53ca8..c292a25c8b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -97,6 +97,7 @@ task: - export ANDROID_NDK_HOME="/opt/homebrew/share/android-ndk" - export CC=/opt/homebrew/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/armv7a-linux-androideabi23-clang - export RANLIB=touch + - ls -l /opt/homebrew/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin - which ar - which ranlib - make TARGET=ARMV7 ARM_SOFTFP_ABI=1 NUM_THREADS=32 HOSTCC=clang NOFORTRAN=1 AR=/usr/bin/ar From 4bff451899447746a510bf213bef3c56195a8d57 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 7 Apr 2026 22:31:55 +0200 Subject: [PATCH 5/6] Update .cirrus.yml --- .cirrus.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index c292a25c8b..74146c87b4 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -96,11 +96,8 @@ task: - brew install --cask android-ndk - export ANDROID_NDK_HOME="/opt/homebrew/share/android-ndk" - export CC=/opt/homebrew/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/armv7a-linux-androideabi23-clang - - export RANLIB=touch - ls -l /opt/homebrew/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin - - which ar - - which ranlib - - make TARGET=ARMV7 ARM_SOFTFP_ABI=1 NUM_THREADS=32 HOSTCC=clang NOFORTRAN=1 AR=/usr/bin/ar + - make TARGET=ARMV7 ARM_SOFTFP_ABI=1 NUM_THREADS=32 HOSTCC=clang NOFORTRAN=1 AR=llvm-ar RANLIB=llvm-ranlib always: config_artifacts: path: "*conf*" From a7534944833a2ba80321b946ca935d8b6b197674 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 7 Apr 2026 22:51:03 +0200 Subject: [PATCH 6/6] Update .cirrus.yml --- .cirrus.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 74146c87b4..7481d4bfd2 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -96,8 +96,9 @@ task: - brew install --cask android-ndk - export ANDROID_NDK_HOME="/opt/homebrew/share/android-ndk" - export CC=/opt/homebrew/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/armv7a-linux-androideabi23-clang - - ls -l /opt/homebrew/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin - - make TARGET=ARMV7 ARM_SOFTFP_ABI=1 NUM_THREADS=32 HOSTCC=clang NOFORTRAN=1 AR=llvm-ar RANLIB=llvm-ranlib + - export AR=/opt/homebrew/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar + - export RANLIB=/opt/homebrew/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ranlib + - make TARGET=ARMV7 ARM_SOFTFP_ABI=1 NUM_THREADS=32 HOSTCC=clang NOFORTRAN=1 always: config_artifacts: path: "*conf*"