8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 16:03:03 +01:00

Update the libcxx (llvm project) to version 19.1.1 (#8285)

This commit is contained in:
Artyom Abakumov 2024-10-19 22:09:49 +03:00 committed by GitHub
parent 591a76107c
commit 025906cf1a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 19 additions and 26 deletions

View File

@ -290,6 +290,8 @@ jobs:
build-macos: build-macos:
name: build-macos-${{ matrix.arch }} name: build-macos-${{ matrix.arch }}
runs-on: ${{ (matrix.arch == 'arm64' && 'macos-14') || 'macos-13' }} runs-on: ${{ (matrix.arch == 'arm64' && 'macos-14') || 'macos-13' }}
env:
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
strategy: strategy:
fail-fast: false fail-fast: false
@ -312,27 +314,17 @@ jobs:
run: | run: |
brew install automake autoconf-archive cmake libtool ninja brew install automake autoconf-archive cmake libtool ninja
# libcxx build is not working with python >= 3.12 - name: Export GitHub Actions cache environment variables
- name: Do not use preinstalled python >= 3.12 uses: actions/github-script@v7
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: with:
key: ${{ runner.os }}-vcpkg-0 script: |
path: | core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
$HOME/.cache/vcpkg/archives core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
- name: Build - name: Build
run: | run: |
export LIBTOOLIZE=glibtoolize export LIBTOOLIZE=glibtoolize
export LIBTOOL=glibtool export LIBTOOL=glibtool
export PATH="$(brew --prefix python@3.11)/bin:$PATH"
./autogen.sh --with-builtin-tommath --with-builtin-tomcrypt ./autogen.sh --with-builtin-tommath --with-builtin-tomcrypt
make -j4 make -j4

View File

@ -5,15 +5,16 @@ set -e
SOURCE_PATH=@SOURCE_PATH@ SOURCE_PATH=@SOURCE_PATH@
INSTALL_PREFIX=@INSTALL_PREFIX@ INSTALL_PREFIX=@INSTALL_PREFIX@
export MACOSX_DEPLOYMENT_TARGET=10.9 export MACOSX_DEPLOYMENT_TARGET=12.7
cmake -G Ninja -S $SOURCE_PATH/llvm \ cmake -G Ninja -S $SOURCE_PATH/llvm \
-DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \ -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \
-DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" \ -DLLVM_ENABLE_PROJECTS="clang" \
-DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DLIBCXX_ENABLE_SHARED=false \ -DLIBCXX_ENABLE_SHARED=false \
-DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=true -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=true
ninja cxx cxxabi ninja runtimes
ninja install-cxx install-cxxabi ninja install-cxx install-cxxabi

View File

@ -1,9 +1,9 @@
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO llvm/llvm-project REPO llvm/llvm-project
REF 75e33f71c2dae584b13a7d1186ae0a038ba98838 REF d401987fe349a87c53fe25829215b080b70c0c1a
HEAD_REF llvmorg-13.0.1 HEAD_REF llvmorg-19.1.1
SHA512 8bd80efe88160f615a9dc6fbcdab693d1459ca483410cf990f25169079e46726429f24ad042d287bfcfef8fd54a8a7264a67a710edaa24ebbf1e815a62b1f812 SHA512 adbcd783b35c635d6a2e3a97a9a183645645f539bb1771062b69e3b5a8f92250882124c71d3b57b0c206e2efb54415c67fed3e46fb023adff4a2fe17d190b250
) )
file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")

View File

@ -1,5 +1,5 @@
{ {
"name": "libcxx", "name": "libcxx",
"version-string": "13.0.1", "version-string": "19.1.1",
"description": "LLVM libc++" "description": "LLVM libc++"
} }

View File

@ -1,7 +1,7 @@
{ {
"2023-08-23": { "2023-08-23": {
"libcxx": { "libcxx": {
"baseline": "13.0.1" "baseline": "19.1.1"
} }
} }
} }

View File

@ -1,8 +1,8 @@
{ {
"versions": [ "versions": [
{ {
"version": "13.0.1", "version": "19.1.1",
"path": "$/ports/libcxx/13.0.1_0" "path": "$/ports/libcxx/19.1.1_0"
} }
] ]
} }

View File

@ -12,7 +12,7 @@
}, },
{ {
"name": "libcxx", "name": "libcxx",
"version": "13.0.1" "version": "19.1.1"
} }
] ]
} }