]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #63169 from andreasstieger/fuse3
authorAdam King <47704447+adk3798@users.noreply.github.com>
Tue, 7 Oct 2025 13:52:18 +0000 (09:52 -0400)
committerGitHub <noreply@github.com>
Tue, 7 Oct 2025 13:52:18 +0000 (09:52 -0400)
ceph.spec.in: build with fuse 3

Reviewed-by: Adam King <adking@redhat.com>
1  2 
ceph.spec.in

diff --cc ceph.spec.in
index 6e9d3d509f91c4dd5a366c8e91cd360af4f33efd,23e4616b06fa8c9042530981867ea32458a6b79b..98fbf7a8ba3ec4dfd9e1110d79c42a6a7303559b
@@@ -236,20 -257,22 +236,20 @@@ BuildRequires:  selinux-policy-deve
  %endif
  BuildRequires:        gperf
  BuildRequires:  cmake > 3.5
- BuildRequires:        fuse-devel
+ BuildRequires:        pkgconfig(fuse3)
  BuildRequires:        git
  BuildRequires:        grpc-devel
 -%if 0%{?fedora} || 0%{?suse_version} > 1500 || 0%{?rhel} == 9 || 0%{?openEuler}
 -BuildRequires:        gcc-c++ >= 11
 -%endif
 -%if 0%{?suse_version} == 1500
 -BuildRequires: gcc11-c++
 -%endif
 -%if 0%{?gts_version} > 0
 -BuildRequires:        gcc-toolset-%{gts_version}-gcc-c++
 -%if 0%{?gts_version} >= 12
 -BuildRequires:        gcc-toolset-%{gts_version}-runtime
 +# Before 13.3, an lto bug resulted in a segfault in SafeTimer and perhaps
 +# elsewhere. Require the fixed version so we can reenable lto. See
 +# ceph bug https://tracker.ceph.com/issues/63867
 +# and
 +# gcc bug https://bugzilla.redhat.com/show_bug.cgi?id=2241339
 +# for details.
 +%if 0%{?gts_version} == 0
 +BuildRequires:        gcc-c++ >= 13.3
  %else
 -BuildRequires:        gcc-toolset-%{gts_version}-build
 -%endif
 +BuildRequires:        gcc-toolset-%{gts_version}-gcc-c++ >= 13.3
 +BuildRequires:        gcc-toolset-%{gts_version}-runtime
  BuildRequires:        gcc-toolset-%{gts_version}-libatomic-devel
  %endif
  %if 0%{?fedora} || 0%{?rhel} == 9 || 0%{?openEuler}