Skip to content

Commit 15b5d50

Browse files
perazzperazz
committed
deprecate gcc-10 on macos-14
1 parent c651d51 commit 15b5d50

File tree

2 files changed

+134
-31
lines changed

2 files changed

+134
-31
lines changed

‎.github/workflows/CI.yml‎

Lines changed: 50 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ jobs:
3333
exclude:
3434
- os: macos-14 # No Intel on MacOS anymore since 2024
3535
toolchain: {compiler: intel, version: '2025.1'}
36+
- os: macos-14 # gcc@10 not available on macos-14 (ARM64)
37+
toolchain: {compiler: gcc, version: 10}
3638
- os: windows-latest # Doesn't pass build and tests yet
3739
toolchain: {compiler: intel, version: '2025.1'}
3840
- os: windows-latest # gcc 14 not available on Windows yet
@@ -75,7 +77,7 @@ jobs:
7577

7678
# Backport gfortran shared libraries to the paths expected by the bootstrap fpm binary.
7779
# The macOS x86_64 release used for bootstrapping has hardcoded library paths from the gcc version
78-
# it was built with. Query those paths using otool and create symlinks to the current gcc version.
80+
# it was built with. If the versions match, skip this step. Otherwise, create symlinks.
7981
# On ARM64 it runs under Rosetta 2 and needs /usr/local paths.
8082
- name: MacOS patch libgfortran
8183
if: contains(matrix.os, 'macos')
@@ -88,34 +90,69 @@ jobs:
8890
echo "Checking library dependencies of fpm bootstrap binary..."
8991
otool -L $(which fpm)
9092
91-
# Extract the expected libgfortran path and create the target directory
93+
# Extract the gcc version from the bootstrap binary's library paths
94+
BOOTSTRAP_GCC_VERSION=$(otool -L $(which fpm) | grep -o 'gcc@[0-9]\+' | head -n 1 | cut -d@ -f2)
95+
if [ -z "$BOOTSTRAP_GCC_VERSION" ]; then
96+
# Try alternative pattern: /lib/gcc/13/ -> extract 13
97+
BOOTSTRAP_GCC_VERSION=$(otool -L $(which fpm) | grep libgfortran | grep -o '/lib/gcc/[0-9]\+/' | grep -o '[0-9]\+' | head -n 1)
98+
fi
99+
100+
echo "Bootstrap fpm built with gcc@$BOOTSTRAP_GCC_VERSION"
101+
echo "Current toolchain: gcc@${{ matrix.toolchain.version }}"
102+
103+
if [ "$BOOTSTRAP_GCC_VERSION" == "${{ matrix.toolchain.version }}" ]; then
104+
echo "✓ Bootstrap gcc version matches current toolchain - no patching needed"
105+
exit 0
106+
fi
107+
108+
echo "⚠ Version mismatch detected - creating compatibility symlinks..."
109+
110+
# Find the actual Cellar path by following the symlink
111+
if [ -L "${BREW_PREFIX}/opt/gcc@${{ matrix.toolchain.version }}" ]; then
112+
GCC_CELLAR_PATH=$(cd -P "${BREW_PREFIX}/opt/gcc@${{ matrix.toolchain.version }}" && pwd)
113+
else
114+
GCC_CELLAR_PATH="${BREW_PREFIX}/Cellar/gcc@${{ matrix.toolchain.version }}"/*
115+
fi
116+
echo "GCC Cellar path: $GCC_CELLAR_PATH"
117+
118+
# Find the actual library files
119+
CURRENT_GFORTRAN=$(find "$GCC_CELLAR_PATH"/lib/gcc/${{ matrix.toolchain.version }} -name "libgfortran.*.dylib" 2>/dev/null | head -n 1)
120+
CURRENT_QUADMATH=$(find "$GCC_CELLAR_PATH"/lib/gcc/${{ matrix.toolchain.version }} -name "libquadmath.*.dylib" 2>/dev/null | head -n 1)
121+
CURRENT_GCC_S=$(find "$GCC_CELLAR_PATH"/lib/gcc/${{ matrix.toolchain.version }} -name "libgcc_s.*.dylib" 2>/dev/null | head -n 1)
122+
123+
echo "Current gcc@${{ matrix.toolchain.version }} libraries:"
124+
echo " libgfortran: $CURRENT_GFORTRAN"
125+
echo " libquadmath: $CURRENT_QUADMATH"
126+
echo " libgcc_s: $CURRENT_GCC_S"
127+
128+
# Extract the expected libgfortran path and create symlink
92129
LIBGFORTRAN_PATH=$(otool -L $(which fpm) | grep libgfortran | awk '{print $1}' | head -n 1)
93-
if [ -n "$LIBGFORTRAN_PATH" ]; then
130+
if [ -n "$LIBGFORTRAN_PATH" ] && [ -n "$CURRENT_GFORTRAN" ]; then
94131
TARGET_DIR=$(dirname "$LIBGFORTRAN_PATH")
95132
echo "Creating directory: $TARGET_DIR"
96133
sudo mkdir -p "$TARGET_DIR"
97-
echo "Linking libgfortran from ${BREW_PREFIX}/opt/gcc@${{ matrix.toolchain.version }}/lib/gcc/${{ matrix.toolchain.version }}/libgfortran.5.dylib to $LIBGFORTRAN_PATH"
98-
sudo ln -fs ${BREW_PREFIX}/opt/gcc@${{ matrix.toolchain.version }}/lib/gcc/${{ matrix.toolchain.version }}/libgfortran.5.dylib "$LIBGFORTRAN_PATH"
134+
echo "Linking $CURRENT_GFORTRAN to $LIBGFORTRAN_PATH"
135+
sudo ln -fs "$CURRENT_GFORTRAN" "$LIBGFORTRAN_PATH"
99136
fi
100137
101-
# Extract the expected libquadmath path and create the target directory
138+
# Extract the expected libquadmath path and create symlink
102139
LIBQUADMATH_PATH=$(otool -L $(which fpm) | grep libquadmath | awk '{print $1}' | head -n 1)
103-
if [ -n "$LIBQUADMATH_PATH" ]; then
140+
if [ -n "$LIBQUADMATH_PATH" ] && [ -n "$CURRENT_QUADMATH" ]; then
104141
TARGET_DIR=$(dirname "$LIBQUADMATH_PATH")
105142
echo "Creating directory: $TARGET_DIR"
106143
sudo mkdir -p "$TARGET_DIR"
107-
echo "Linking libquadmath from ${BREW_PREFIX}/opt/gcc@${{ matrix.toolchain.version }}/lib/gcc/${{ matrix.toolchain.version }}/libquadmath.0.dylib to $LIBQUADMATH_PATH"
108-
sudo ln -fs ${BREW_PREFIX}/opt/gcc@${{ matrix.toolchain.version }}/lib/gcc/${{ matrix.toolchain.version }}/libquadmath.0.dylib "$LIBQUADMATH_PATH"
144+
echo "Linking $CURRENT_QUADMATH to $LIBQUADMATH_PATH"
145+
sudo ln -fs "$CURRENT_QUADMATH" "$LIBQUADMATH_PATH"
109146
fi
110147
111-
# Extract the expected libgcc_s path and create the target directory
148+
# Extract the expected libgcc_s path and create symlink
112149
LIBGCC_PATH=$(otool -L $(which fpm) | grep libgcc_s | awk '{print $1}' | head -n 1)
113-
if [ -n "$LIBGCC_PATH" ]; then
150+
if [ -n "$LIBGCC_PATH" ] && [ -n "$CURRENT_GCC_S" ]; then
114151
TARGET_DIR=$(dirname "$LIBGCC_PATH")
115152
echo "Creating directory: $TARGET_DIR"
116153
sudo mkdir -p "$TARGET_DIR"
117-
echo "Linking libgcc_s from ${BREW_PREFIX}/lib/gcc/${{ matrix.toolchain.version }}/libgcc_s.1.dylib to $LIBGCC_PATH"
118-
sudo ln -fs ${BREW_PREFIX}/lib/gcc/${{ matrix.toolchain.version }}/libgcc_s.1.dylib "$LIBGCC_PATH"
154+
echo "Linking $CURRENT_GCC_S to $LIBGCC_PATH"
155+
sudo ln -fs "$CURRENT_GCC_S" "$LIBGCC_PATH"
119156
fi
120157
121158
# gcc and g++ will point to clang/clang++: use versioned alias for fpm

‎.github/workflows/meta.yml‎

Lines changed: 84 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,8 @@ jobs:
208208
# Only install gcc if not already available
209209
which gfortran-${{ env.GCC_V }} || brew install gcc@${{ env.GCC_V }}
210210
which gfortran-${{ env.GCC_V }}
211-
which gfortran || ln -s /usr/local/bin/gfortran-${{ env.GCC_V }} /usr/local/bin/gfortran
211+
BREW_PREFIX=$(brew --prefix)
212+
which gfortran || ln -s ${BREW_PREFIX}/bin/gfortran-${{ env.GCC_V }} ${BREW_PREFIX}/bin/gfortran
212213
213214
- name: (macOS) Install homebrew MPICH
214215
if: contains(matrix.mpi,'mpich') && contains(matrix.os,'macos')
@@ -231,26 +232,91 @@ jobs:
231232
brew install netcdf
232233
brew install netcdf-fortran
233234
234-
- name: (macOS) Patch gfortran paths
235-
if: contains(matrix.os,'macos')
236-
run: |
237-
# Backport gfortran shared libraries to version 10 folder. This is necessary because all macOS releases of fpm
238-
# have these paths hardcoded in the executable (no PIC?). Current bootstrap version 0.8.0 has gcc-10
239-
mkdir /usr/local/opt/gcc@10
240-
mkdir /usr/local/opt/gcc@10/lib
241-
mkdir /usr/local/opt/gcc@10/lib/gcc
242-
mkdir /usr/local/opt/gcc@10/lib/gcc/10
243-
mkdir /usr/local/lib/gcc/10
244-
ln -fs /usr/local/opt/gcc@${{ env.GCC_V }}/lib/gcc/${{ env.GCC_V }}/libquadmath.0.dylib /usr/local/opt/gcc@10/lib/gcc/10/libquadmath.0.dylib
245-
ln -fs /usr/local/opt/gcc@${{ env.GCC_V }}/lib/gcc/${{ env.GCC_V }}/libgfortran.5.dylib /usr/local/opt/gcc@10/lib/gcc/10/libgfortran.5.dylib
246-
# Newer gcc versions use libgcc_s.1.1.dylib
247-
ln -fs /usr/local/lib/gcc/${{ env.GCC_V }}/libgcc_s.1.dylib /usr/local/lib/gcc/10/libgcc_s.1.dylib || ln -fs /usr/local/lib/gcc/${{ env.GCC_V }}/libgcc_s.1.1.dylib /usr/local/lib/gcc/10/libgcc_s.1.dylib
248-
249235
# Phase 1: Bootstrap fpm with existing version
250236
- name: Install fpm
251-
uses: fortran-lang/setup-fpm@v7
237+
uses: fortran-lang/setup-fpm@v8
252238
with:
253-
fpm-version: 'v0.8.0'
239+
fpm-version: 'v0.12.0'
240+
241+
# Backport gfortran shared libraries to the paths expected by the bootstrap fpm binary.
242+
# The macOS x86_64 release used for bootstrapping has hardcoded library paths from the gcc version
243+
# it was built with. If the versions match, skip this step. Otherwise, create symlinks.
244+
# On ARM64 it runs under Rosetta 2 and needs /usr/local paths.
245+
- name: MacOS patch libgfortran
246+
if: contains(matrix.os, 'macos')
247+
run: |
248+
which gfortran-${{ env.GCC_V }}
249+
which gfortran || true
250+
BREW_PREFIX=$(brew --prefix)
251+
252+
# Query the actual library paths that fpm expects
253+
echo "Checking library dependencies of fpm bootstrap binary..."
254+
otool -L $(which fpm)
255+
256+
# Extract the gcc version from the bootstrap binary's library paths
257+
BOOTSTRAP_GCC_VERSION=$(otool -L $(which fpm) | grep -o 'gcc@[0-9]\+' | head -n 1 | cut -d@ -f2)
258+
if [ -z "$BOOTSTRAP_GCC_VERSION" ]; then
259+
# Try alternative pattern: /lib/gcc/13/ -> extract 13
260+
BOOTSTRAP_GCC_VERSION=$(otool -L $(which fpm) | grep libgfortran | grep -o '/lib/gcc/[0-9]\+/' | grep -o '[0-9]\+' | head -n 1)
261+
fi
262+
263+
echo "Bootstrap fpm built with gcc@$BOOTSTRAP_GCC_VERSION"
264+
echo "Current toolchain: gcc@${{ env.GCC_V }}"
265+
266+
if [ "$BOOTSTRAP_GCC_VERSION" == "${{ env.GCC_V }}" ]; then
267+
echo "✓ Bootstrap gcc version matches current toolchain - no patching needed"
268+
exit 0
269+
fi
270+
271+
echo "⚠ Version mismatch detected - creating compatibility symlinks..."
272+
273+
# Find the actual Cellar path by following the symlink
274+
if [ -L "${BREW_PREFIX}/opt/gcc@${{ env.GCC_V }}" ]; then
275+
GCC_CELLAR_PATH=$(cd -P "${BREW_PREFIX}/opt/gcc@${{ env.GCC_V }}" && pwd)
276+
else
277+
GCC_CELLAR_PATH="${BREW_PREFIX}/Cellar/gcc@${{ env.GCC_V }}"/*
278+
fi
279+
echo "GCC Cellar path: $GCC_CELLAR_PATH"
280+
281+
# Find the actual library files
282+
CURRENT_GFORTRAN=$(find "$GCC_CELLAR_PATH"/lib/gcc/${{ env.GCC_V }} -name "libgfortran.*.dylib" 2>/dev/null | head -n 1)
283+
CURRENT_QUADMATH=$(find "$GCC_CELLAR_PATH"/lib/gcc/${{ env.GCC_V }} -name "libquadmath.*.dylib" 2>/dev/null | head -n 1)
284+
CURRENT_GCC_S=$(find "$GCC_CELLAR_PATH"/lib/gcc/${{ env.GCC_V }} -name "libgcc_s.*.dylib" 2>/dev/null | head -n 1)
285+
286+
echo "Current gcc@${{ env.GCC_V }} libraries:"
287+
echo " libgfortran: $CURRENT_GFORTRAN"
288+
echo " libquadmath: $CURRENT_QUADMATH"
289+
echo " libgcc_s: $CURRENT_GCC_S"
290+
291+
# Extract the expected libgfortran path and create symlink
292+
LIBGFORTRAN_PATH=$(otool -L $(which fpm) | grep libgfortran | awk '{print $1}' | head -n 1)
293+
if [ -n "$LIBGFORTRAN_PATH" ] && [ -n "$CURRENT_GFORTRAN" ]; then
294+
TARGET_DIR=$(dirname "$LIBGFORTRAN_PATH")
295+
echo "Creating directory: $TARGET_DIR"
296+
sudo mkdir -p "$TARGET_DIR"
297+
echo "Linking $CURRENT_GFORTRAN to $LIBGFORTRAN_PATH"
298+
sudo ln -fs "$CURRENT_GFORTRAN" "$LIBGFORTRAN_PATH"
299+
fi
300+
301+
# Extract the expected libquadmath path and create symlink
302+
LIBQUADMATH_PATH=$(otool -L $(which fpm) | grep libquadmath | awk '{print $1}' | head -n 1)
303+
if [ -n "$LIBQUADMATH_PATH" ] && [ -n "$CURRENT_QUADMATH" ]; then
304+
TARGET_DIR=$(dirname "$LIBQUADMATH_PATH")
305+
echo "Creating directory: $TARGET_DIR"
306+
sudo mkdir -p "$TARGET_DIR"
307+
echo "Linking $CURRENT_QUADMATH to $LIBQUADMATH_PATH"
308+
sudo ln -fs "$CURRENT_QUADMATH" "$LIBQUADMATH_PATH"
309+
fi
310+
311+
# Extract the expected libgcc_s path and create symlink
312+
LIBGCC_PATH=$(otool -L $(which fpm) | grep libgcc_s | awk '{print $1}' | head -n 1)
313+
if [ -n "$LIBGCC_PATH" ] && [ -n "$CURRENT_GCC_S" ]; then
314+
TARGET_DIR=$(dirname "$LIBGCC_PATH")
315+
echo "Creating directory: $TARGET_DIR"
316+
sudo mkdir -p "$TARGET_DIR"
317+
echo "Linking $CURRENT_GCC_S to $LIBGCC_PATH"
318+
sudo ln -fs "$CURRENT_GCC_S" "$LIBGCC_PATH"
319+
fi
254320
255321
- name: Remove fpm from path
256322
shell: bash

0 commit comments

Comments
 (0)