diff --git a/.gitignore b/.gitignore index 94e50e8..8726558 100644 --- a/.gitignore +++ b/.gitignore @@ -190,3 +190,7 @@ /clang-14.0.5.src.tar.xz.sig /clang-tools-extra-14.0.5.src.tar.xz /clang-tools-extra-14.0.5.src.tar.xz.sig +/clang-14.0.6.src.tar.xz.sig +/clang-14.0.6.src.tar.xz +/clang-tools-extra-14.0.6.src.tar.xz +/clang-tools-extra-14.0.6.src.tar.xz.sig diff --git a/clang.spec b/clang.spec index 9ea33ec..17b43d8 100644 --- a/clang.spec +++ b/clang.spec @@ -4,7 +4,7 @@ %global maj_ver 14 %global min_ver 0 -%global patch_ver 5 +%global patch_ver 6 %global clang_version %{maj_ver}.%{min_ver}.%{patch_ver} %if %{with compat_build} @@ -82,8 +82,13 @@ Patch201: llvm-hello.patch # See https://github.com/llvm/llvm-project/issues/54116 Patch202: remove-test.patch -BuildRequires: gcc -BuildRequires: gcc-c++ +# RHEL only: We build LLVM with clang, which now defaults to using the +# libstdc++ from gcc-toolset-12. Since we're linking some clang +# tools statically to some static libraries from LLVM, we +# need to use libstdc++12 as well. So, use gcc-toolset-12 +# to compile clang. +BuildRequires: gcc-toolset-12-gcc-c++ +BuildRequires: gcc-toolset-12-annobin-plugin-gcc BuildRequires: cmake BuildRequires: ninja-build %if %{with compat_build} @@ -349,6 +354,8 @@ mv ../clang-%{compat_ver}.src ../clang # -DLLVM_ENABLE_NEW_PASS_MANAGER=ON can be removed once this patch is committed: # https://reviews.llvm.org/D107628 %cmake -G Ninja \ + -DCMAKE_C_COMPILER=/opt/rh/gcc-toolset-12/root/usr/bin/gcc \ + -DCMAKE_CXX_COMPILER=/opt/rh/gcc-toolset-12/root/usr/bin/g++ \ -DLLVM_PARALLEL_LINK_JOBS=1 \ -DLLVM_LINK_LLVM_DYLIB:BOOL=ON \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ @@ -642,6 +649,9 @@ false %endif %changelog +* Tue Jul 19 2022 Timm Bäder - 14.0.6-1 +- Update to 14.0.6 + * Mon Jun 20 2022 Timm Bäder - 14.0.5-1 - Update to 14.0.5 diff --git a/sources b/sources index 7549359..0ad1482 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (clang-14.0.5.src.tar.xz) = e69faea16e06c8eb4c7cf9969573a5af7dfad9c280d1858dc9655007129e83744dbca3bf928a040e9b66fc84738f76eccd8ae5bc61cf11be7e62d79dafabb5a2 -SHA512 (clang-14.0.5.src.tar.xz.sig) = f727ddf5c4995645c6782c396a7e83d62c62c0a16afd9320ab5205ef497886ccb9ab3de24879cdab4e4a4edd4f281b371e26686d0ab721a5edec7781929ce40f -SHA512 (clang-tools-extra-14.0.5.src.tar.xz) = 9b729f04f769f8209a7bcca909d8a98b76d4789ab32707d5a55f7588a653c3b08a39c2f1bc61325a807315580069aa2dcb5c9fe1e5b1853a58fc548593154490 -SHA512 (clang-tools-extra-14.0.5.src.tar.xz.sig) = 5146c238eba412afeb6839352f5974247470d92efcb5a30c876c76a112554d029d7d9e9bc3e748fc2e44db15857ddf81f226548372ca7f1f04bf7359b338570a +SHA512 (clang-14.0.6.src.tar.xz.sig) = ece52f4807fd4f6dadaae5ef539d4033f15848b8fafd428fc9896db2191aab59be134cbba1914e4175f5bb51fdfa74b5ab81f2bb818f5f67c441383a839325e9 +SHA512 (clang-14.0.6.src.tar.xz) = 5f5497b57dd116225e90f321902f1015beb50c0b1bb90d0fc6c026f13aa748feabe44f98eb75e86f98f3b1785ad5e850210732f3eae75b942ecd520527dcd30b +SHA512 (clang-tools-extra-14.0.6.src.tar.xz) = b55fd9872e52a27599e27fa665cf39af3d172814c0e7246ea0e57286e9eea42bf816f8b6d350334f3fe5e2fae35a8e59d59e71a3a5de330ecb0622ef7655e63f +SHA512 (clang-tools-extra-14.0.6.src.tar.xz.sig) = 775181d38d9be1722d756899b5be57406fd14b6e0016a68f1bd573036e928012300f575b7708454baf5821c55bbb3f57b6c248b7875c02b99f6c223196d6c2d7