pool/rdma-core
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1108990 from home:NMorey:branches:science:HPC

Browse Source 
- Add missing-quoting.patch
- Use normal GNU tar option syntax
- Remove old RPM spec logic (%defattr)

OBS-URL: https://build.opensuse.org/request/show/1108990
OBS-URL: https://build.opensuse.org/package/show/science:HPC/rdma-core?expand=0&rev=173
This commit is contained in:
Nicolas Morey 2023-09-05 07:38:41 +00:00 committed by Git OBS Bridge
parent 236a226b4b
commit cfc999accf
4 changed files with 49 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
missing-quoting.patch Normal file
View File

@ -0,0 +1,38 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2023-08-23 13:14:49.075825691 +0200
Subject: build: unbreak configure stage when RELWITHDEBINFO is blank/has space
When cmake is invoked with either an empty argument or one that
involves a space,
```sh
cmake ... -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING=""`
cmake ... -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="-O2 -O2"
```
then rdma's CMakeLists.txt falls on its face:
[ 3s] CMake Error at buildlib/RDMA_BuildType.cmake:32 (if):
[ 3s] if given arguments:
[ 3s]
[ 3s] "STREQUAL" " -O2 -g -DNDEBUG"
[ 3s]
[ 3s] Unknown arguments specified
---
buildlib/RDMA_BuildType.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: rdma-core-47.0.0.ccb120cc7b7f/buildlib/RDMA_BuildType.cmake
===================================================================
--- buildlib/RDMA_BuildType.cmake
+++ buildlib/RDMA_BuildType.cmake
@@ -29,7 +29,7 @@ function(RDMA_BuildType)
# with the -DNDEBUG removed
foreach (language CXX C)
set(VAR_TO_MODIFY "CMAKE_${language}_FLAGS_RELWITHDEBINFO")
- if (${${VAR_TO_MODIFY}} STREQUAL ${${VAR_TO_MODIFY}_INIT})
+ if ("${${VAR_TO_MODIFY}}" STREQUAL "${${VAR_TO_MODIFY}_INIT}")
string(REGEX REPLACE "(^| )[/-]D *NDEBUG($| )"
" "
replacement

2
post_download.sh
View File

@ -12,7 +12,7 @@ sed -i -e 's/^%define with_static .*$/%define with_static 0/' rdma-core.spec
bash gen-pandoc.sh || exit 1
EXTRA_SOURCES="Source2: post_download.sh\nSource3: prebuilt-pandoc.tgz\nSource4: rdma-core-rpmlintrc\nSource5: gen-pandoc.sh\nSource6: get_build.py"
PANDOC_SETUP="#Extract prebuilt pandoc file in the buildlib directory\n(cd buildlib && tar xf %{S:3})"
PANDOC_SETUP="#Extract prebuilt pandoc file in the buildlib directory\n(cd buildlib && tar -xf %{S:3})"
sed -i -e '/Source1:/a '"$EXTRA_SOURCES" rdma-core.spec
sed -i -e '/^BuildRequires: pandoc/d' rdma-core.spec
sed -i -e '/^BuildRequires: python3-docutils/d' rdma-core.spec

7
rdma-core.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Aug 23 11:19:49 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
- Add missing-quoting.patch
- Use normal GNU tar option syntax
- Remove old RPM spec logic (%defattr)
-------------------------------------------------------------------
Thu Aug 3 15:03:33 UTC 2023 - Nicolas Morey <nicolas.morey@suse.com>

24
rdma-core.spec
View File

@ -75,6 +75,7 @@ Source4: rdma-core-rpmlintrc
Source5: gen-pandoc.sh
Source6: get_build.py
Patch0: disable-rdma-interface-renaming.patch
Patch1: missing-quoting.patch
BuildRequires: binutils
BuildRequires: cmake >= 2.8.11
BuildRequires: gcc
@ -424,8 +425,9 @@ easy, object-oriented access to IB verbs.
%prep
%setup -q -n %{name}-%{version}%{git_ver}
#Extract prebuilt pandoc file in the buildlib directory
(cd buildlib && tar xf %{S:3})
(cd buildlib && tar -xf %{S:3})
%patch0
%patch1
%build
@ -625,7 +627,6 @@ done
%service_del_postun rdma-ndd.service
%files
%defattr(-,root,root)
%dir %{_sysconfdir}/rdma
%dir %{_sysconfdir}/rdma/modules
%dir %{_docdir}/%{name}-%{version}
@ -663,7 +664,6 @@ done
%{_sbindir}/rcrdma
%files devel
%defattr(-,root,root)
%doc %{_docdir}/%{name}-%{version}/MAINTAINERS
%dir %{_includedir}/infiniband
%dir %{_includedir}/rdma
@ -692,7 +692,6 @@ done
%endif
%files -n libibverbs
%defattr(-,root,root)
%dir %{_sysconfdir}/libibverbs.d
%dir %{_libdir}/libibverbs
%{_libdir}/libibverbs/*.so
@ -703,42 +702,33 @@ done
%{_mandir}/man7/rxe*
%files -n libibnetdisc%{ibnetdisc_major}
%defattr(-, root, root)
%{_libdir}/libibnetdisc.so.*
%files -n libibmad%{mad_major}
%defattr(-, root, root)
%{_libdir}/libibmad.so.*
%files -n %verbs_lname
%defattr(-,root,root)
%{_libdir}/libibverbs*.so.*
%if 0%{?dma_coherent}
%files -n %efa_lname
%defattr(-,root,root)
%{_libdir}/libefa*.so.*
%files -n %mana_lname
%defattr(-,root,root)
%{_libdir}/libmana*.so.*
%files -n %mlx4_lname
%defattr(-,root,root)
%{_libdir}/libmlx4*.so.*
%files -n %mlx5_lname
%defattr(-,root,root)
%{_libdir}/libmlx5*.so.*
%endif
%files -n libibverbs-utils
%defattr(-,root,root)
%{_bindir}/ibv_*
%{_mandir}/man1/ibv_*
%files -n ibacm
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/rdma/ibacm_opts.cfg
%{_bindir}/ib_acme
%{_sbindir}/ibacm
@ -754,7 +744,6 @@ done
%doc %{_docdir}/%{name}-%{version}/ibacm.md
%files -n infiniband-diags
%defattr(-, root, root)
%dir %{_sysconfdir}/infiniband-diags
%config(noreplace) %{_sysconfdir}/infiniband-diags/*
%{_sbindir}/ibaddr
@ -821,7 +810,6 @@ done
%{perl_vendorlib}/IBswcountlimits.pm
%files -n iwpmd
%defattr(-,root,root)
%dir %{_sysconfdir}/rdma
%dir %{_sysconfdir}/rdma/modules
%{_sbindir}/iwpmd
@ -834,22 +822,18 @@ done
%{_mandir}/man5/iwpmd.*
%files -n %umad_lname
%defattr(-,root,root)
%{_libdir}/libibumad*.so.*
%files -n %rdmacm_lname
%defattr(-,root,root)
%{_libdir}/librdmacm*.so.*
%doc %{_docdir}/%{name}-%{version}/librdmacm.md
%files -n rsocket
%defattr(-,root,root)
%dir %{_libdir}/rsocket
%{_libdir}/rsocket/*.so*
%{_mandir}/man7/rsocket.*
%files -n librdmacm-utils
%defattr(-,root,root)
%{_bindir}/cmtime
%{_bindir}/mckey
%{_bindir}/rcopy
@ -878,7 +862,6 @@ done
%{_mandir}/man1/udpong.*
%files -n srp_daemon
%defattr(-,root,root)
%dir %{_libexecdir}/srp_daemon
%dir %{_sysconfdir}/rdma
%dir %{_sysconfdir}/rdma/modules
@ -899,7 +882,6 @@ done
%doc %{_docdir}/%{name}-%{version}/ibsrpdm.md
%files -n rdma-ndd
%defattr(-, root, root)
%{_sbindir}/rdma-ndd
%{_sbindir}/rcrdma-ndd
%{_unitdir}/rdma-ndd.service