RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-16 15:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

ceph.spec.in: use %enable_devtoolset11 to enable GTS-11

Browse Source 
%enable_devtoolset11 redefines %___build_pre by appending
`source scl_source enable gcc-toolset-11` to it. `___build_pre` should
be able to populate this setting to both %build and %install. and hence
address the FTBFS where we need to use the tool chain from GTS-11.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 49459d92fe)
This commit is contained in:
Kefu Chai 2022-06-27 21:18:57 +08:00 committed by Radoslaw Zarzynski
parent f05b671798
commit 89a6a2d802
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ceph.spec.in
View File

@ -145,6 +145,16 @@
%endif
%endif
%if 0%{with seastar}
# disable -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1, as gcc-toolset-{10,11}-annobin
# do not provide gcc-annobin.so anymore, despite that they provide annobin.so. but
# redhat-rpm-config still passes -fplugin=gcc-annobin to the compiler.
%undefine _annotated_build
%if 0%{?enable_devtoolset11:1}
%enable_devtoolset11
%endif
%endif
#################################################################################
# main package definition
#################################################################################
@ -192,6 +202,7 @@ BuildRequires: cmake > 3.5
BuildRequires: fuse-devel
%if 0%{with seastar} && 0%{?rhel}
BuildRequires: gcc-toolset-11-gcc-c++
BuildRequires: gcc-toolset-11-build
%else
%if 0%{?suse_version}
BuildRequires: gcc11-c++
@ -1246,10 +1257,6 @@ This package provides Ceph default alerts for Prometheus.
%define _lto_cflags %{nil}
%endif
%if 0%{with seastar} && 0%{?rhel}
. /opt/rh/gcc-toolset-11/enable
%endif
%if 0%{with cephfs_java}
# Find jni.h
for i in /usr/{lib64,lib}/jvm/java/include{,/linux}; do
@ -1272,12 +1279,6 @@ export CXXFLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g')
# remove from CFLAGS too because it causes the arrow submodule to fail with:
# warning _FORTIFY_SOURCE requires compiling with optimization (-O)
export CFLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g')
%if 0%{?fedora} || 0%{?rhel}
# disable -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1, as gcc-toolset-{9,10}-annobin
# do not provide gcc-annobin.so anymore, despite that they provide annobin.so. but
# redhat-rpm-config still passes -fplugin=gcc-annobin to the compiler.
%undefine _annotated_build
%endif
%endif
env | sort
@ -1408,13 +1409,6 @@ popd
%install
%if 0%{with seastar}
%if 0%{?fedora} || 0%{?rhel}
%undefine _annotated_build
. /opt/rh/gcc-toolset-11/enable
%endif
%endif
pushd %{_vpath_builddir}
%make_install
# we have dropped sysvinit bits