From bff70d2608f24b1829923802122563b980ecf193 Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Mon, 4 Jul 2022 16:48:47 +0800 Subject: [PATCH 1/2] update to clang-13.0.1-2.module+el8.6.0+15487+86bd2a95 Signed-off-by: Zhao Hang --- clang.spec | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/clang.spec b/clang.spec index 7992dd6..0268b49 100644 --- a/clang.spec +++ b/clang.spec @@ -1,4 +1,3 @@ -%define anolis_release .0.1 %bcond_with compat_build %bcond_without check @@ -77,9 +76,15 @@ %bcond_with python3 %endif +%if 0%{?rhel} +%global gcc_toolset_version 11 +%global gcc_pkg_prefix gcc-toolset-%{gcc_toolset_version}- +%global gcc_install_prefix /opt/rh/gcc-toolset-%{gcc_toolset_version}/root/usr/ +%endif + Name: %pkg_name Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}} -Release: 1%{anolis_release}%{?dist} +Release: 2%{?dist} Summary: A C language family front-end for LLVM License: NCSA @@ -102,7 +107,6 @@ Patch2: 0003-PATCH-clang-Don-t-install-static-libraries.patch Patch3: 0001-Driver-Add-a-gcc-equivalent-triple-to-the-list-of-tr.patch Patch4: 0001-cmake-Allow-shared-libraries-to-customize-the-soname.patch Patch5: 0001-PATCH-clang-Fix-scan-build-py-executable-lookup-path.patch -Patch6: 0001-Support-LoongArch.patch # Patches for clang-tools-extra @@ -180,8 +184,8 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} # clang requires gcc, clang++ requires libstdc++-devel # - https://bugzilla.redhat.com/show_bug.cgi?id=1021645 # - https://bugzilla.redhat.com/show_bug.cgi?id=1158594 -Requires: libstdc++-devel -Requires: gcc-c++ +Requires: %{?gcc_pkg_prefix}libstdc++-devel +Requires: %{?gcc_pkg_prefix}gcc-c++ Provides: clang(major) = %{maj_ver} @@ -387,6 +391,7 @@ cd %{_vpath_builddir} \ -DCLANG_BUILD_EXAMPLES:BOOL=OFF \ -DBUILD_SHARED_LIBS=OFF \ + %{?gcc_install_prefix:-DGCC_INSTALL_PREFIX=%{gcc_install_prefix}} \ -DCLANG_REPOSITORY_STRING="%{?fedora:Fedora}%{?rhel:Red Hat} %{version}-%{release}" \ -DCLANG_DEFAULT_UNWINDLIB=libgcc @@ -589,8 +594,9 @@ false %endif %changelog -* Thu Jun 16 2022 chenli - 13.0.1-1.0.1 -- Support LoongArch +* Tue May 24 2022 Tom Stellard - 13.0.1-2 +- Use libstdc++ from gcc-toolset-11 +- Resolves: rhbz#2088672 * Thu Feb 03 2022 Tom Stellard - 13.0.1-1 - 13.0.1 Release -- Gitee From 4cb6bc5201587d02dedef2e8f4cba6d7ea233f1e Mon Sep 17 00:00:00 2001 From: chenli Date: Mon, 13 Jun 2022 09:55:40 +0800 Subject: [PATCH 2/2] Support LoongArch --- clang.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/clang.spec b/clang.spec index 0268b49..26cff1a 100644 --- a/clang.spec +++ b/clang.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 %bcond_with compat_build %bcond_without check @@ -84,7 +85,7 @@ Name: %pkg_name Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}} -Release: 2%{?dist} +Release: 2%{anolis_release}%{?dist} Summary: A C language family front-end for LLVM License: NCSA @@ -107,6 +108,7 @@ Patch2: 0003-PATCH-clang-Don-t-install-static-libraries.patch Patch3: 0001-Driver-Add-a-gcc-equivalent-triple-to-the-list-of-tr.patch Patch4: 0001-cmake-Allow-shared-libraries-to-customize-the-soname.patch Patch5: 0001-PATCH-clang-Fix-scan-build-py-executable-lookup-path.patch +Patch6: 0001-Support-LoongArch.patch # Patches for clang-tools-extra @@ -594,6 +596,9 @@ false %endif %changelog +* Mon Jul 04 2022 chenli - 13.0.1-2.0.1 +- Support LoongArch + * Tue May 24 2022 Tom Stellard - 13.0.1-2 - Use libstdc++ from gcc-toolset-11 - Resolves: rhbz#2088672 -- Gitee