From 32fbbe80ca7e88cd61da1e5f7ce1e64fa3db05a0 Mon Sep 17 00:00:00 2001 From: zhoumeng2 Date: Wed, 8 Mar 2023 14:02:34 +0800 Subject: [PATCH 1/4] add clang+llvm compiler support --- ceph.spec | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/ceph.spec b/ceph.spec index ce5f180..50ad69e 100644 --- a/ceph.spec +++ b/ceph.spec @@ -24,6 +24,7 @@ %bcond_with zbd %bcond_with cmake_verbose_logging %bcond_without ceph_test_package +%bcond_with clang %ifarch s390 %bcond_with tcmalloc %else @@ -120,6 +121,10 @@ # disable dwz which compresses the debuginfo %global _find_debuginfo_dwz_opts %{nil} +%if 0%{with clang} +%global toolchain clang +%endif + ################################################################################# # main package definition ################################################################################# @@ -183,8 +188,13 @@ BuildRequires: fuse-devel %if 0%{with seastar} BuildRequires: gcc-toolset-9-gcc-c++ >= 9.2.1-2.3 %else +%if 0%{with clang} +BuildRequires: clang +BuildRequires: llvm +%else BuildRequires: gcc-c++ %endif +%endif %if 0%{with tcmalloc} # libprofiler did not build on ppc64le until 2.7.90 %if 0%{?fedora} || 0%{?rhel} >= 8 || 0%{?openEuler} @@ -1363,7 +1373,16 @@ cat ./CMakeFiles/CMakeOutput.log cat ./CMakeFiles/CMakeError.log %endif +#add clang+LLVM support +%if %{with clang} +%global make_opts HOSTCC=clang CC=clang CXX=clang++ +%endif +%if %{with clang} +make %{?make_opts} "$CEPH_MFLAGS_JOBS" +%else make "$CEPH_MFLAGS_JOBS" +%endif + %if 0%{with make_check} -- Gitee From c21a98b486c54bde52828aaba7e16d364db604cc Mon Sep 17 00:00:00 2001 From: zhoumeng2 Date: Wed, 8 Mar 2023 17:09:46 +0800 Subject: [PATCH 2/4] add changelog --- ceph.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ceph.spec b/ceph.spec index 50ad69e..575d756 100644 --- a/ceph.spec +++ b/ceph.spec @@ -2519,6 +2519,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Wed Mar 8 2023 zhoumeng -2:16.2.7-16 +- add clang+llvm support for ceph compiling + * Tue Feb 14 2023 wangzengliang - 2:16.2.7-15 - fix error for uninstall cephadm -- Gitee From c44e28c3523ba5f93ca5ebdc4e40e51f3a9722f7 Mon Sep 17 00:00:00 2001 From: zhoumeng2 Date: Wed, 8 Mar 2023 20:12:43 +0800 Subject: [PATCH 3/4] normalize changelog --- ceph.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ceph.spec b/ceph.spec index 575d756..336f01d 100644 --- a/ceph.spec +++ b/ceph.spec @@ -2519,7 +2519,7 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog -* Wed Mar 8 2023 zhoumeng -2:16.2.7-16 +* Wed Mar 8 2023 zhoumeng - 2:16.2.7-16 - add clang+llvm support for ceph compiling * Tue Feb 14 2023 wangzengliang - 2:16.2.7-15 -- Gitee From b412642f32b419038e15b94926bef39493be9d8e Mon Sep 17 00:00:00 2001 From: zhoumeng2 Date: Tue, 21 Mar 2023 14:06:11 +0800 Subject: [PATCH 4/4] change release --- ceph.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ceph.spec b/ceph.spec index 336f01d..e51a157 100644 --- a/ceph.spec +++ b/ceph.spec @@ -130,7 +130,7 @@ ################################################################################# Name: ceph Version: 16.2.7 -Release: 15 +Release: 16 %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} Epoch: 2 %endif -- Gitee