Hi, On 2023-09-28 19:20:27 -0700, Andres Freund wrote: > Thus the easiest fix looks to be to use this: > > diff --git a/meson.build b/meson.build > index 5422885b0a2..16a2b0f801e 100644 > --- a/meson.build > +++ b/meson.build > @@ -224,7 +224,7 @@ elif host_system == 'darwin' > library_path_var = 'DYLD_LIBRARY_PATH' > > export_file_format = 'darwin' > - export_fmt = '-exported_symbols_list=@0@' > + export_fmt = '-Wl,-exported_symbols_list,@0@' > > mod_link_args_fmt = ['-bundle_loader', '@0@'] > mod_link_with_dir = 'bindir' > > > I don't have anything older than Ventura to check though.
Attached is the above change and a commit to change CI over to Sonoma. Not sure when we should switch, but it seems useful to include for testing purposes at the very least. Greetings, Andres Freund
>From 9733a689e2e7280197e7ff188eb1ae306e199c82 Mon Sep 17 00:00:00 2001 From: Andres Freund <and...@anarazel.de> Date: Thu, 28 Sep 2023 19:27:03 -0700 Subject: [PATCH v1 1/2] meson: macos: Correct -exported_symbols_list syntax for Sonoma compat -exported_symbols_list=... works on Ventura and a few earlier releases, but not on Sonoma. The easiest way to fix it is to -Wl,-exported_symbols_list,@0@ which actually seems more appropriate anyway, it's obviously a linker argument. Discussion: https://postgr.es/m/20230928222248.jw6s7yktpfsfc...@alap3.anarazel.de --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 5422885b0a2..862c955453f 100644 --- a/meson.build +++ b/meson.build @@ -224,7 +224,7 @@ elif host_system == 'darwin' library_path_var = 'DYLD_LIBRARY_PATH' export_file_format = 'darwin' - export_fmt = '-exported_symbols_list=@0@' + export_fmt = '-Wl,-exported_symbols_list,@0@' mod_link_args_fmt = ['-bundle_loader', '@0@'] mod_link_with_dir = 'bindir' -- 2.41.0.rc2
>From 6948fec81a41a666117552dc157b72f236335c88 Mon Sep 17 00:00:00 2001 From: Andres Freund <and...@anarazel.de> Date: Thu, 28 Sep 2023 19:29:44 -0700 Subject: [PATCH v1 2/2] ci: macos: Switch to Sonoma Discussion: https://postgr.es/m/20230928222248.jw6s7yktpfsfc...@alap3.anarazel.de --- .cirrus.tasks.yml | 4 ++-- src/tools/ci/ci_macports_packages.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cirrus.tasks.yml b/.cirrus.tasks.yml index e137769850d..97088a7728a 100644 --- a/.cirrus.tasks.yml +++ b/.cirrus.tasks.yml @@ -410,7 +410,7 @@ task: task: - name: macOS - Ventura - Meson + name: macOS - Sonoma - Meson env: CPUS: 4 # always get that much for cirrusci macOS instances @@ -419,7 +419,7 @@ task: # work OK. See # https://postgr.es/m/20220927040208.l3shfcidovpzqxfh%40awork3.anarazel.de TEST_JOBS: 8 - IMAGE: ghcr.io/cirruslabs/macos-ventura-base:latest + IMAGE: ghcr.io/cirruslabs/macos-sonoma-base:latest CIRRUS_WORKING_DIR: ${HOME}/pgsql/ CCACHE_DIR: ${HOME}/ccache diff --git a/src/tools/ci/ci_macports_packages.sh b/src/tools/ci/ci_macports_packages.sh index 4bc594a31d1..3f5f272c9ff 100755 --- a/src/tools/ci/ci_macports_packages.sh +++ b/src/tools/ci/ci_macports_packages.sh @@ -13,7 +13,7 @@ set -e packages="$@" -macports_url="https://github.com/macports/macports-base/releases/download/v2.8.1/MacPorts-2.8.1-13-Ventura.pkg"; +macports_url="https://github.com/macports/macports-base/releases/download/v2.8.1/MacPorts-2.8.1-14-Sonoma.pkg"; cache_dmg="macports.hfs.dmg" if [ "$CIRRUS_CI" != "true" ]; then -- 2.41.0.rc2
