diff --git a/.gitignore b/.gitignore index 15abeb8..0568dd2 100644 --- a/.gitignore +++ b/.gitignore @@ -171,3 +171,7 @@ /clang-tools-extra-12.0.1rc1.src.tar.xz.sig /clang-12.0.1rc1.src.tar.xz /clang-12.0.1rc1.src.tar.xz.sig +/clang-12.0.1rc3.src.tar.xz +/clang-12.0.1rc3.src.tar.xz.sig +/clang-tools-extra-12.0.1rc3.src.tar.xz +/clang-tools-extra-12.0.1rc3.src.tar.xz.sig diff --git a/0001-PATCH-clang-tools-extra-Make-clangd-CompletionModel-.patch b/0001-PATCH-clang-tools-extra-Make-clangd-CompletionModel-.patch deleted file mode 100644 index 4745e78..0000000 --- a/0001-PATCH-clang-tools-extra-Make-clangd-CompletionModel-.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 84e4fe467f290c85b3d7d22c7333d192e1282054 Mon Sep 17 00:00:00 2001 -From: serge-sans-paille -Date: Wed, 17 Mar 2021 08:32:56 +0100 -Subject: [PATCH] [PATCH][clang-tools-extra] Make clangd CompletionModel usable - even with non-standard (but supported) layout - -llvm supports specifying a non-standard layout where each project lies in its -own place. Do not assume a fixed layout and use the appropriate cmake variable -instead. ---- - clang-tools-extra/clangd/quality/CompletionModel.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/clang-tools-extra/clangd/quality/CompletionModel.cmake b/clang-tools-extra/clangd/quality/CompletionModel.cmake -index 60c6d2a..41bc2ed 100644 ---- a/clang-tools-extra/clangd/quality/CompletionModel.cmake -+++ b/clang-tools-extra/clangd/quality/CompletionModel.cmake -@@ -5,8 +5,8 @@ - # will define a C++ class called ${cpp_class} - which may be a - # namespace-qualified class name. - function(gen_decision_forest model filename cpp_class) -- set(model_compiler ${CMAKE_SOURCE_DIR}/../clang-tools-extra/clangd/quality/CompletionModelCodegen.py) -- -+ set(model_compiler ${LLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR}/clangd/quality/CompletionModelCodegen.py) -+ - set(output_dir ${CMAKE_CURRENT_BINARY_DIR}) - set(header_file ${output_dir}/${filename}.h) - set(cpp_file ${output_dir}/${filename}.cpp) --- -1.8.3.1 - diff --git a/clang.spec b/clang.spec index 10a6512..65899c8 100644 --- a/clang.spec +++ b/clang.spec @@ -3,7 +3,7 @@ %global maj_ver 12 %global min_ver 0 %global patch_ver 1 -%global rc_ver 1 +%global rc_ver 3 %global clang_version %{maj_ver}.%{min_ver}.%{patch_ver} %global clang_tools_binaries \ @@ -66,7 +66,7 @@ Name: %pkg_name Version: %{clang_version}%{?rc_ver:~rc%{rc_ver}} -Release: 3%{?dist} +Release: 1%{?dist} Summary: A C language family front-end for LLVM License: NCSA @@ -86,11 +86,6 @@ Patch2: 0003-PATCH-clang-Don-t-install-static-libraries.patch Patch3: 0004-PATCH-clang-Prefer-gcc-toolchains-with-libgcc_s.so-w.patch Patch5: 0006-PATCH-clang-Allow-__ieee128-as-an-alias-to-__float12.patch -# Patches for clang-tools-extra -%if %{without compat_build} -Patch201: 0001-PATCH-clang-tools-extra-Make-clangd-CompletionModel-.patch -%endif - BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: cmake @@ -532,6 +527,9 @@ false %endif %changelog +* Wed Jun 30 2021 Tom Stellard - clang-12.0.1~rc3-1 +- 12.0.1-rc3 Release + * Tue Jun 08 2021 Tom Stellard - 12.0.1~rc1-3 - Only enable -funwind-tables by default on Fedora arches diff --git a/sources b/sources index c19ac3a..f96fd9f 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (clang-tools-extra-12.0.1rc1.src.tar.xz) = ced7fa7c4371e877320801bccf16e751f21d157d98013dfe3bf44afbeb65192de8c8b9159646f9a734755b1f98c0c7501eb08a6a861d369939ecc2f7a82f065a -SHA512 (clang-tools-extra-12.0.1rc1.src.tar.xz.sig) = 7223e89717704daed790d1ba67a31de73746ffe674b7ff0e530c25a29807def1cf1808e05e83a095d1d8cb274fc1eaf305ca7c1870deb6d28773f79e8fa2e00e -SHA512 (clang-12.0.1rc1.src.tar.xz) = 113c8ad54502adfa1568598bf54bb25456d1f30c742360394c8b50d1dda466b12da3658d52fc38bc17feb8c07d99cf04143a3c7d8da700883305c303c4792d7b -SHA512 (clang-12.0.1rc1.src.tar.xz.sig) = 7b047a423d8a2ef75399982d5a70cf6f59c63f142ee3899eecb382c2c352c40df7fed1032e72334d604ec4a1d368db11da85d951c5020b3e1e45d5984f937ac1 +SHA512 (clang-12.0.1rc3.src.tar.xz) = a21e745bfd12798331bf5f70d68c3c95c4b47a93c763bd8eae128acd5389299cbe6054fee7c4ab4a8f81ec2b63334252e5ea3e04579cfc7c4edd8b36841f6c36 +SHA512 (clang-12.0.1rc3.src.tar.xz.sig) = 34d059926bb148a753865485e8ce62907637794c4aba5bca5edcf21ede8be4828324ebac92855488592680886ba32e01af555c21b74e953122106d80adbdeab7 +SHA512 (clang-tools-extra-12.0.1rc3.src.tar.xz) = a3a83289ef6ff3d7a7af476f833007fbd17bb7c251a87d5a4c35c28bcd0576c519c56f81003972d8c205675c048be2cc7506896568d4bf14ec5a1c57ccb5b8bf +SHA512 (clang-tools-extra-12.0.1rc3.src.tar.xz.sig) = 6bea02b53324fdbe8adbe6c15257fe3bbd298cab3e59591208e7731eafba9f4edea79b026d72a0f1461e23d70a0ee1cad113a08783eec2b9ad56fe4041bc9211