From 2c7a3e01653fa5262d88bbe28c8edb24286bc69f Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 7 Sep 2022 16:14:07 +0200 Subject: [PATCH] Fix compat build Backport changes from clang14 package. We need to exclude patches for clang-format (which we don't build for compat packages). Additionally, clang14-devel needs a dependency on clang14-libs, otherwise this only installs dead symlinks without the shared objects they point to. --- clang.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/clang.spec b/clang.spec index 68494a3..e4382f1 100644 --- a/clang.spec +++ b/clang.spec @@ -68,9 +68,11 @@ Patch5: 0010-PATCH-clang-Produce-DWARF4-by-default.patch # TODO: Can be dropped in LLVM 16: https://reviews.llvm.org/D133316 Patch6: 0001-Mark-fopenmp-implicit-rpath-as-NoArgumentUnused.patch +%if %{without compat_build} # Patches for clang-tools-extra # See https://reviews.llvm.org/D120301 Patch201: 0001-clang-tools-extra-Make-test-dependency-on-LLVMHello-.patch +%endif BuildRequires: clang BuildRequires: cmake @@ -178,11 +180,11 @@ Runtime library for clang. %package devel Summary: Development header files for clang +Requires: %{name}-libs = %{version}-%{release} %if %{without compat_build} Requires: %{name}%{?_isa} = %{version}-%{release} # The clang CMake files reference tools from clang-tools-extra. Requires: %{name}-tools-extra%{?_isa} = %{version}-%{release} -Requires: %{name}-libs = %{version}-%{release} %endif %description devel