From b112eb68bf8245bad4c0ce280c3fb4c52bb83868 Mon Sep 17 00:00:00 2001 From: Konrad Kleine Date: Tue, 5 Jul 2022 10:33:50 +0200 Subject: [PATCH] compat_build: Avoid patching non-existing clang-tools-extra Given that we're building `--with=compat_build`, when we don't exclude the patches, the following logic will try to apply all patches to clang even if they are meant for clang-tools-extra: ``` %if %{with compat_build} %autosetup -n %{clang_srcdir} -p2 %else ``` I'm not willing to patch the %auto... part because I fear to break stuff. Both ways work. --- clang.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/clang.spec b/clang.spec index c3ccf43..ae32679 100644 --- a/clang.spec +++ b/clang.spec @@ -69,11 +69,13 @@ Patch5: 0001-Work-around-gcc-miscompile.patch Patch6: m-branch-protection.patch Patch7: 0010-PATCH-clang-Produce-DWARF4-by-default.patch +%if %{without compat_build} # Patches for clang-tools-extra # See https://reviews.llvm.org/D120301 Patch201: llvm-hello.patch # See https://github.com/llvm/llvm-project/issues/54116 Patch202: remove-test.patch +%endif BuildRequires: gcc BuildRequires: gcc-c++