rpms/ceph
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Do not use mold in RHEL/ELN builds

Browse Source
This commit is contained in:
Yaakov Selkowitz 2023-06-06 20:33:50 -04:00
parent 9a0799bc61
commit 1ab48d0e0d
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ceph.spec
View File

@ -35,6 +35,15 @@
%else %else
%bcond_with rbd_rwl_cache %bcond_with rbd_rwl_cache
%endif %endif
%if 0%{?rhel}
%bcond_with ld_mold
%else
%ifarch x86_64 aarch64
%bcond_without ld_mold
%else
%bcond_with ld_mold
%endif
%endif
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
%ifarch s390x %{arm64} %ifarch s390x %{arm64}
%bcond_with system_pmdk %bcond_with system_pmdk
@ -160,7 +169,7 @@
################################################################################# #################################################################################
Name: ceph Name: ceph
Version: 17.2.6 Version: 17.2.6
Release: 7%{?dist} Release: 8%{?dist}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Epoch: 2 Epoch: 2
%endif %endif
@ -236,7 +245,7 @@ BuildRequires: libatomic
BuildRequires: gcc-c++ BuildRequires: gcc-c++
%endif %endif
BuildRequires: libatomic BuildRequires: libatomic
%ifarch x86_64 aarch64 %if 0%{with ld_mold}
BuildRequires: mold BuildRequires: mold
%endif %endif
%if 0%{with tcmalloc} %if 0%{with tcmalloc}
@ -1447,7 +1456,7 @@ env | sort
%if 0%{with system_utf8proc} %if 0%{with system_utf8proc}
-DWITH_SYSTEM_UTF8PROC:BOOL=ON \ -DWITH_SYSTEM_UTF8PROC:BOOL=ON \
%endif %endif
%ifarch x86_64 aarch64 %if 0%{with ld_mold}
-DCMAKE_LINKER=%{_bindir}/ld.mold \ -DCMAKE_LINKER=%{_bindir}/ld.mold \
%endif %endif
%if 0%{with seastar} %if 0%{with seastar}
@ -2606,6 +2615,9 @@ exit 0
%config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
%changelog %changelog
* Wed Jun 07 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 2:17.2.6-8
- Do not use mold in RHEL/ELN builds
* Tue May 9 2023 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:17.2.6-7 * Tue May 9 2023 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:17.2.6-7
- ceph-17.2.6, use ldconfig and ldconfig_scriptlet macros - ceph-17.2.6, use ldconfig and ldconfig_scriptlet macros