From c80f641205067c75af902b9df99e7e49a52bbb2e Mon Sep 17 00:00:00 2001 From: Artyom Abakumov Date: Wed, 16 Oct 2024 14:24:26 +0300 Subject: [PATCH 01/13] Update libcxx (llvm project) version to version 19.1.1 --- .../ports/libcxx/{13.0.1_0 => 19.1.1_0}/build.sh.in | 7 ++++--- .../ports/libcxx/{13.0.1_0 => 19.1.1_0}/portfile.cmake | 6 +++--- .../ports/libcxx/{13.0.1_0 => 19.1.1_0}/vcpkg.json | 2 +- vcpkg-custom/registry/versions/baseline.json | 2 +- vcpkg-custom/registry/versions/l-/libcxx.json | 4 ++-- 5 files changed, 11 insertions(+), 10 deletions(-) rename vcpkg-custom/registry/ports/libcxx/{13.0.1_0 => 19.1.1_0}/build.sh.in (69%) rename vcpkg-custom/registry/ports/libcxx/{13.0.1_0 => 19.1.1_0}/portfile.cmake (71%) rename vcpkg-custom/registry/ports/libcxx/{13.0.1_0 => 19.1.1_0}/vcpkg.json (64%) diff --git a/vcpkg-custom/registry/ports/libcxx/13.0.1_0/build.sh.in b/vcpkg-custom/registry/ports/libcxx/19.1.1_0/build.sh.in similarity index 69% rename from vcpkg-custom/registry/ports/libcxx/13.0.1_0/build.sh.in rename to vcpkg-custom/registry/ports/libcxx/19.1.1_0/build.sh.in index 5c3af6a1708..6ffe92d0556 100755 --- a/vcpkg-custom/registry/ports/libcxx/13.0.1_0/build.sh.in +++ b/vcpkg-custom/registry/ports/libcxx/19.1.1_0/build.sh.in @@ -5,15 +5,16 @@ set -e SOURCE_PATH=@SOURCE_PATH@ INSTALL_PREFIX=@INSTALL_PREFIX@ -export MACOSX_DEPLOYMENT_TARGET=10.9 +export MACOSX_DEPLOYMENT_TARGET=14.6 cmake -G Ninja -S $SOURCE_PATH/llvm \ -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \ - -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" \ + -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" \ -DCMAKE_BUILD_TYPE=Release \ + -DLIBCXXABI_USE_LLVM_UNWINDER=OFF \ -DLIBCXX_ENABLE_SHARED=false \ -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=true -ninja cxx cxxabi +ninja runtimes ninja install-cxx install-cxxabi diff --git a/vcpkg-custom/registry/ports/libcxx/13.0.1_0/portfile.cmake b/vcpkg-custom/registry/ports/libcxx/19.1.1_0/portfile.cmake similarity index 71% rename from vcpkg-custom/registry/ports/libcxx/13.0.1_0/portfile.cmake rename to vcpkg-custom/registry/ports/libcxx/19.1.1_0/portfile.cmake index 28632efede9..1c1a320d0fa 100644 --- a/vcpkg-custom/registry/ports/libcxx/13.0.1_0/portfile.cmake +++ b/vcpkg-custom/registry/ports/libcxx/19.1.1_0/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO llvm/llvm-project - REF 75e33f71c2dae584b13a7d1186ae0a038ba98838 - HEAD_REF llvmorg-13.0.1 - SHA512 8bd80efe88160f615a9dc6fbcdab693d1459ca483410cf990f25169079e46726429f24ad042d287bfcfef8fd54a8a7264a67a710edaa24ebbf1e815a62b1f812 + REF d401987fe349a87c53fe25829215b080b70c0c1a + HEAD_REF llvmorg-19.1.1 + SHA512 adbcd783b35c635d6a2e3a97a9a183645645f539bb1771062b69e3b5a8f92250882124c71d3b57b0c206e2efb54415c67fed3e46fb023adff4a2fe17d190b250 ) file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") diff --git a/vcpkg-custom/registry/ports/libcxx/13.0.1_0/vcpkg.json b/vcpkg-custom/registry/ports/libcxx/19.1.1_0/vcpkg.json similarity index 64% rename from vcpkg-custom/registry/ports/libcxx/13.0.1_0/vcpkg.json rename to vcpkg-custom/registry/ports/libcxx/19.1.1_0/vcpkg.json index 3045ceaeff5..b35a00970ea 100644 --- a/vcpkg-custom/registry/ports/libcxx/13.0.1_0/vcpkg.json +++ b/vcpkg-custom/registry/ports/libcxx/19.1.1_0/vcpkg.json @@ -1,5 +1,5 @@ { "name": "libcxx", - "version-string": "13.0.1", + "version-string": "19.1.1", "description": "LLVM libc++" } diff --git a/vcpkg-custom/registry/versions/baseline.json b/vcpkg-custom/registry/versions/baseline.json index 2ef56176b85..3940e753336 100644 --- a/vcpkg-custom/registry/versions/baseline.json +++ b/vcpkg-custom/registry/versions/baseline.json @@ -1,7 +1,7 @@ { "2023-08-23": { "libcxx": { - "baseline": "13.0.1" + "baseline": "19.1.1" } } } diff --git a/vcpkg-custom/registry/versions/l-/libcxx.json b/vcpkg-custom/registry/versions/l-/libcxx.json index 803468b7332..92d768cdfad 100644 --- a/vcpkg-custom/registry/versions/l-/libcxx.json +++ b/vcpkg-custom/registry/versions/l-/libcxx.json @@ -1,8 +1,8 @@ { "versions": [ { - "version": "13.0.1", - "path": "$/ports/libcxx/13.0.1_0" + "version": "19.1.1", + "path": "$/ports/libcxx/19.1.1_0" } ] } From 953096d80920766d27e7b27571d7c1601b129eb7 Mon Sep 17 00:00:00 2001 From: Artyom Abakumov Date: Wed, 16 Oct 2024 14:28:23 +0300 Subject: [PATCH 02/13] Bump libcxx version in vcpkg manifest --- vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg.json b/vcpkg.json index a395f577e10..dd4cf250d7c 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -12,7 +12,7 @@ }, { "name": "libcxx", - "version": "13.0.1" + "version": "19.1.1" } ] } From 4de6993803a56da1188617c72f8cd37b83b17f58 Mon Sep 17 00:00:00 2001 From: Artyom Abakumov Date: Wed, 16 Oct 2024 14:29:51 +0300 Subject: [PATCH 03/13] Remove python downgrading in CI The old version of Python is no longer requires for modern llvm build --- .github/workflows/main.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fd51205f88f..04cf63f0c98 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -312,15 +312,6 @@ jobs: run: | brew install automake autoconf-archive cmake libtool ninja - # libcxx build is not working with python >= 3.12 - - name: Do not use preinstalled python >= 3.12 - run: | - brew uninstall --ignore-dependencies python@3.12 - [ -e /Library/Frameworks/Python.framework ] && \ - sudo mv /Library/Frameworks/Python.framework /Library/Frameworks/Python.framework.dont-look-at-this - brew install python@3.11 - ln -s "$(brew --prefix python@3.11)/bin/python3" "$(brew --prefix python@3.11)/bin/python" - - name: Cache - vcpkg uses: actions/cache@v4 with: @@ -332,7 +323,7 @@ jobs: run: | export LIBTOOLIZE=glibtoolize export LIBTOOL=glibtool - export PATH="$(brew --prefix python@3.11)/bin:$PATH" + export PATH="$(brew --prefix python3)/bin:$PATH" ./autogen.sh --with-builtin-tommath --with-builtin-tomcrypt make -j4 From 75f45b1aa0626f56a695fed0e5ada3dff380d68d Mon Sep 17 00:00:00 2001 From: Artyom Abakumov Date: Wed, 16 Oct 2024 17:17:23 +0300 Subject: [PATCH 04/13] Decrement MACOSX_DEPLOYMENT_TARGET to fix CI build --- vcpkg-custom/registry/ports/libcxx/19.1.1_0/build.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg-custom/registry/ports/libcxx/19.1.1_0/build.sh.in b/vcpkg-custom/registry/ports/libcxx/19.1.1_0/build.sh.in index 6ffe92d0556..3fd89ef99d0 100755 --- a/vcpkg-custom/registry/ports/libcxx/19.1.1_0/build.sh.in +++ b/vcpkg-custom/registry/ports/libcxx/19.1.1_0/build.sh.in @@ -5,7 +5,7 @@ set -e SOURCE_PATH=@SOURCE_PATH@ INSTALL_PREFIX=@INSTALL_PREFIX@ -export MACOSX_DEPLOYMENT_TARGET=14.6 +export MACOSX_DEPLOYMENT_TARGET=12.7 cmake -G Ninja -S $SOURCE_PATH/llvm \ -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \ From 41d5b767916e59847d29e69bcf741712494490bb Mon Sep 17 00:00:00 2001 From: Artyom Abakumov Date: Thu, 17 Oct 2024 10:05:01 +0300 Subject: [PATCH 05/13] Temporary display content of vcpkg error files to see problem with macos intel build --- configure.ac | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac index 8c64248cb2a..c1aa3c4b35c 100644 --- a/configure.ac +++ b/configure.ac @@ -93,6 +93,8 @@ if test "x$VCPKG_TRIPLET" != "x" ; then fi ./vcpkg/vcpkg install --triplet=$VCPKG_TRIPLET + cat /Users/runner/work/firebird/firebird/vcpkg/buildtrees/libcxx/build-fb-x64-osx-rel-out.log + cat /Users/runner/work/firebird/firebird/vcpkg/buildtrees/libcxx/build-fb-x64-osx-rel-err.log VCPKG_INSTALLED=`pwd`/vcpkg_installed/$VCPKG_TRIPLET AC_SUBST(VCPKG_INSTALLED) From 214a11d34a53ca2987dcf13a5f35b0cea3de2e32 Mon Sep 17 00:00:00 2001 From: Artyom Abakumov Date: Thu, 17 Oct 2024 11:27:23 +0300 Subject: [PATCH 06/13] Revert MACOSX_DEPLOYMENT_TARGET to 10.9 --- .github/workflows/main.yml | 3 +++ configure.ac | 2 -- vcpkg-custom/registry/ports/libcxx/19.1.1_0/build.sh.in | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 04cf63f0c98..bd7e35bffd8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -326,6 +326,9 @@ jobs: export PATH="$(brew --prefix python3)/bin:$PATH" ./autogen.sh --with-builtin-tommath --with-builtin-tomcrypt + cat /Users/runner/work/firebird/firebird/vcpkg/buildtrees/libcxx/build-fb-x64-osx-rel-out.log + cat /Users/runner/work/firebird/firebird/vcpkg/buildtrees/libcxx/build-fb-x64-osx-rel-err.log + make -j4 make tests -j4 make run_tests diff --git a/configure.ac b/configure.ac index c1aa3c4b35c..8c64248cb2a 100644 --- a/configure.ac +++ b/configure.ac @@ -93,8 +93,6 @@ if test "x$VCPKG_TRIPLET" != "x" ; then fi ./vcpkg/vcpkg install --triplet=$VCPKG_TRIPLET - cat /Users/runner/work/firebird/firebird/vcpkg/buildtrees/libcxx/build-fb-x64-osx-rel-out.log - cat /Users/runner/work/firebird/firebird/vcpkg/buildtrees/libcxx/build-fb-x64-osx-rel-err.log VCPKG_INSTALLED=`pwd`/vcpkg_installed/$VCPKG_TRIPLET AC_SUBST(VCPKG_INSTALLED) diff --git a/vcpkg-custom/registry/ports/libcxx/19.1.1_0/build.sh.in b/vcpkg-custom/registry/ports/libcxx/19.1.1_0/build.sh.in index 3fd89ef99d0..508259b241c 100755 --- a/vcpkg-custom/registry/ports/libcxx/19.1.1_0/build.sh.in +++ b/vcpkg-custom/registry/ports/libcxx/19.1.1_0/build.sh.in @@ -5,7 +5,7 @@ set -e SOURCE_PATH=@SOURCE_PATH@ INSTALL_PREFIX=@INSTALL_PREFIX@ -export MACOSX_DEPLOYMENT_TARGET=12.7 +export MACOSX_DEPLOYMENT_TARGET=10.9 cmake -G Ninja -S $SOURCE_PATH/llvm \ -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \ From cd02a98fee5a76072a2f5f155e13fec0a169a0d7 Mon Sep 17 00:00:00 2001 From: Artyom Abakumov Date: Thu, 17 Oct 2024 15:13:59 +0300 Subject: [PATCH 07/13] New key for vcpkg cache --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bd7e35bffd8..0019bb96457 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -315,7 +315,7 @@ jobs: - name: Cache - vcpkg uses: actions/cache@v4 with: - key: ${{ runner.os }}-vcpkg-0 + key: ${{ runner.os }}-vcpkg-fb6-0 path: | $HOME/.cache/vcpkg/archives From b0404eeabd879977802c83f85f7e8bc21f6adb15 Mon Sep 17 00:00:00 2001 From: Artyom Abakumov Date: Thu, 17 Oct 2024 15:21:46 +0300 Subject: [PATCH 08/13] Do not break macos arm build --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0019bb96457..190406c62c6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -326,8 +326,8 @@ jobs: export PATH="$(brew --prefix python3)/bin:$PATH" ./autogen.sh --with-builtin-tommath --with-builtin-tomcrypt - cat /Users/runner/work/firebird/firebird/vcpkg/buildtrees/libcxx/build-fb-x64-osx-rel-out.log - cat /Users/runner/work/firebird/firebird/vcpkg/buildtrees/libcxx/build-fb-x64-osx-rel-err.log + cat ./vcpkg/buildtrees/libcxx/build-fb-*-osx-rel-out.log 2>/dev/null + cat ./vcpkg/buildtrees/libcxx/build-fb-*-osx-rel-err.log 2>/dev/null make -j4 make tests -j4 From 1d47420c724a6d64550df84aae3da7f85f1d7456 Mon Sep 17 00:00:00 2001 From: Artyom Abakumov Date: Thu, 17 Oct 2024 15:27:34 +0300 Subject: [PATCH 09/13] Try to fix macos intel build --- vcpkg-custom/registry/ports/libcxx/19.1.1_0/build.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vcpkg-custom/registry/ports/libcxx/19.1.1_0/build.sh.in b/vcpkg-custom/registry/ports/libcxx/19.1.1_0/build.sh.in index 508259b241c..3646de9e32b 100755 --- a/vcpkg-custom/registry/ports/libcxx/19.1.1_0/build.sh.in +++ b/vcpkg-custom/registry/ports/libcxx/19.1.1_0/build.sh.in @@ -5,13 +5,13 @@ set -e SOURCE_PATH=@SOURCE_PATH@ INSTALL_PREFIX=@INSTALL_PREFIX@ -export MACOSX_DEPLOYMENT_TARGET=10.9 +export MACOSX_DEPLOYMENT_TARGET=12.7 cmake -G Ninja -S $SOURCE_PATH/llvm \ -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \ - -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" \ + -DLLVM_ENABLE_PROJECTS="clang" \ + -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" \ -DCMAKE_BUILD_TYPE=Release \ - -DLIBCXXABI_USE_LLVM_UNWINDER=OFF \ -DLIBCXX_ENABLE_SHARED=false \ -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=true From 81be149d5b5b617b402f2d2356dd2c08d35bdd53 Mon Sep 17 00:00:00 2001 From: Artyom Abakumov Date: Thu, 17 Oct 2024 23:07:23 +0300 Subject: [PATCH 10/13] Remove debug cat command --- .github/workflows/main.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fd42b6102ca..b8ec0303a43 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -326,8 +326,6 @@ jobs: export PATH="$(brew --prefix python3)/bin:$PATH" ./autogen.sh --with-builtin-tommath --with-builtin-tomcrypt - cat ./vcpkg/buildtrees/libcxx/build-fb-*-osx-rel-out.log 2>/dev/null - cat ./vcpkg/buildtrees/libcxx/build-fb-*-osx-rel-err.log 2>/dev/null make -j4 make tests -j4 From 6a3c9388a89d20fd3fad118aa6c2232367dd1717 Mon Sep 17 00:00:00 2001 From: Artyom Abakumov Date: Fri, 18 Oct 2024 10:09:32 +0300 Subject: [PATCH 11/13] Remove extra line from main.yml --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b8ec0303a43..3a30bb49ce7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -326,7 +326,6 @@ jobs: export PATH="$(brew --prefix python3)/bin:$PATH" ./autogen.sh --with-builtin-tommath --with-builtin-tomcrypt - make -j4 make tests -j4 make run_tests From e22ddd55223fa9d7c600f76ee4af95531f8a1350 Mon Sep 17 00:00:00 2001 From: Artyom Abakumov Date: Fri, 18 Oct 2024 18:49:28 +0300 Subject: [PATCH 12/13] Try to remove exporting path to python --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3a30bb49ce7..b49676123c8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -323,7 +323,6 @@ jobs: run: | export LIBTOOLIZE=glibtoolize export LIBTOOL=glibtool - export PATH="$(brew --prefix python3)/bin:$PATH" ./autogen.sh --with-builtin-tommath --with-builtin-tomcrypt make -j4 From 83412c46615e77af0464f1a473a40e194ab940b3 Mon Sep 17 00:00:00 2001 From: Artyom Abakumov Date: Sat, 19 Oct 2024 20:09:38 +0300 Subject: [PATCH 13/13] Use different way to cache vcpkg in CI --- .github/workflows/main.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b49676123c8..875960c7906 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -290,6 +290,8 @@ jobs: build-macos: name: build-macos-${{ matrix.arch }} runs-on: ${{ (matrix.arch == 'arm64' && 'macos-14') || 'macos-13' }} + env: + VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" strategy: fail-fast: false @@ -312,12 +314,12 @@ jobs: run: | brew install automake autoconf-archive cmake libtool ninja - - name: Cache - vcpkg - uses: actions/cache@v4 + - name: Export GitHub Actions cache environment variables + uses: actions/github-script@v7 with: - key: ${{ runner.os }}-vcpkg-fb6-0 - path: | - $HOME/.cache/vcpkg/archives + script: | + core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); + core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || ''); - name: Build run: |