From bb564072379641b32a86dc4820a80a1ceb8a615c Mon Sep 17 00:00:00 2001 From: Honggang Li Date: Jul 31 2020 03:16:24 +0000 Subject: Update cmake options Fedora 33 System-Wide Change proposal: CMake to do out-of-source builds FC33 rpmbuild failed because of this system-wide change. Update cmake options to fix this issue. Signed-off-by: Honggang Li --- diff --git a/rdma-core.spec b/rdma-core.spec index ec8b383..82c2649 100644 --- a/rdma-core.spec +++ b/rdma-core.spec @@ -1,6 +1,6 @@ Name: rdma-core Version: 30.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: RDMA core userspace libraries and daemons # Almost everything is licensed under the OFA dual GPLv2, 2 Clause BSD license @@ -28,7 +28,7 @@ BuildRequires: /usr/bin/rst2man BuildRequires: valgrind-devel BuildRequires: systemd BuildRequires: systemd-devel -%if 0%{?fedora} >= 32 +%if 0%{?fedora} >= 32 || 0%{?rhel} >= 8 %define with_pyverbs %{?_with_pyverbs: 0} %{?!_with_pyverbs: 1} %else %define with_pyverbs %{?_with_pyverbs: 1} %{?!_with_pyverbs: 0} @@ -67,8 +67,8 @@ Conflicts: infiniband-diags <= 1.6.7 # Ninja was introduced in FC23 BuildRequires: ninja-build %define CMAKE_FLAGS -GNinja -%define make_jobs ninja-build -v %{?_smp_mflags} -%define cmake_install DESTDIR=%{buildroot} ninja-build install +%define make_jobs ninja-build -C %{__cmake_builddir} -v %{?_smp_mflags} +%define cmake_install DESTDIR=%{buildroot} ninja-build -C %{__cmake_builddir} install %else # Fallback to make otherwise BuildRequires: make @@ -262,7 +262,6 @@ easy, object-oriented access to IB verbs. %endif %prep -%setup %autosetup -v -p1 %build @@ -342,7 +341,7 @@ install -D -m0755 redhat/rdma.sriov-init %{buildroot}%{_libexecdir}/rdma-set-sri install -D -m0755 redhat/rdma.mlx4-setup.sh %{buildroot}%{_libexecdir}/mlx4-setup.sh # ibacm -bin/ib_acme -D . -O +%{buildroot}%{_bindir}/ib_acme -D . -O install -D -m0644 ibacm_opts.cfg %{buildroot}%{_sysconfdir}/rdma/ # Delete the package's init.d scripts @@ -662,6 +661,9 @@ fi %endif %changelog +* Thu Jul 30 2020 Honggang Li - 30.0-6 +- Update cmake options + * Wed Jul 29 2020 Fedora Release Engineering - 30.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild