rpms/rdma-core
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Update cmake options

Browse Source 
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 <honli@redhat.com>
This commit is contained in:
Honggang Li 2020-07-30 23:15:26 -04:00
parent 6ed3481498
commit bb56407237
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rdma-core.spec
View File

@ -1,6 +1,6 @@
Name: rdma-core Name: rdma-core
Version: 30.0 Version: 30.0
Release: 5%{?dist} Release: 6%{?dist}
Summary: RDMA core userspace libraries and daemons Summary: RDMA core userspace libraries and daemons
# Almost everything is licensed under the OFA dual GPLv2, 2 Clause BSD license # 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: valgrind-devel
BuildRequires: systemd BuildRequires: systemd
BuildRequires: systemd-devel BuildRequires: systemd-devel
%if 0%{?fedora} >= 32 %if 0%{?fedora} >= 32 || 0%{?rhel} >= 8
%define with_pyverbs %{?_with_pyverbs: 0} %{?!_with_pyverbs: 1} %define with_pyverbs %{?_with_pyverbs: 0} %{?!_with_pyverbs: 1}
%else %else
%define with_pyverbs %{?_with_pyverbs: 1} %{?!_with_pyverbs: 0} %define with_pyverbs %{?_with_pyverbs: 1} %{?!_with_pyverbs: 0}
@ -67,8 +67,8 @@ Conflicts: infiniband-diags <= 1.6.7
# Ninja was introduced in FC23 # Ninja was introduced in FC23
BuildRequires: ninja-build BuildRequires: ninja-build
%define CMAKE_FLAGS -GNinja %define CMAKE_FLAGS -GNinja
%define make_jobs ninja-build -v %{?_smp_mflags} %define make_jobs ninja-build -C %{__cmake_builddir} -v %{?_smp_mflags}
%define cmake_install DESTDIR=%{buildroot} ninja-build install %define cmake_install DESTDIR=%{buildroot} ninja-build -C %{__cmake_builddir} install
%else %else
# Fallback to make otherwise # Fallback to make otherwise
BuildRequires: make BuildRequires: make
@ -262,7 +262,6 @@ easy, object-oriented access to IB verbs.
%endif %endif
%prep %prep
%setup
%autosetup -v -p1 %autosetup -v -p1
%build %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 install -D -m0755 redhat/rdma.mlx4-setup.sh %{buildroot}%{_libexecdir}/mlx4-setup.sh
# ibacm # ibacm
bin/ib_acme -D . -O %{buildroot}%{_bindir}/ib_acme -D . -O
install -D -m0644 ibacm_opts.cfg %{buildroot}%{_sysconfdir}/rdma/ install -D -m0644 ibacm_opts.cfg %{buildroot}%{_sysconfdir}/rdma/
# Delete the package's init.d scripts # Delete the package's init.d scripts
@ -662,6 +661,9 @@ fi
%endif %endif
%changelog %changelog
* Thu Jul 30 2020 Honggang Li <honli@redhat.com> - 30.0-6
- Update cmake options
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 30.0-5 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 30.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild