Re: [PR PATCH] [Updated] rdma-core: update to 43.0.

[kruceter <kruceter@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 599 bytes --]

There is an updated pull request by kruceter against master on the void-packages repository

https://github.com/kruceter/void-packages rdma-core
https://github.com/void-linux/void-packages/pull/40866

rdma-core: update to 43.0.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - armv6l-musl (cross)


A patch file from https://github.com/void-linux/void-packages/pull/40866.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rdma-core-40866.patch --]
[-- Type: text/x-diff, Size: 6198 bytes --]

From f3a107605cbbcafa2a84f68f394d1d8029dba2c2 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Thu, 1 Dec 2022 03:12:11 +0300
Subject: [PATCH 1/2] rdma-core: update to 43.0.

---
 common/shlibs                            |  4 ++++
 srcpkgs/rdma-core/patches/manpages.patch | 22 +++++++++++++++++++
 srcpkgs/rdma-core/template               | 28 +++++++++++++-----------
 3 files changed, 41 insertions(+), 13 deletions(-)
 create mode 100644 srcpkgs/rdma-core/patches/manpages.patch

diff --git a/common/shlibs b/common/shlibs
index 965eef4df56f..a94b39430ec7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3628,8 +3628,12 @@ libfrr.so.0 libfrr-6.0_1
 libkaccounts.so.2 kaccounts-integration-20.04.3_1
 libfrrospfapiclient.so.0 libfrrospfapiclient-6.0_1
 liborocos-kdl.so.1.4 orocos-kdl-1.4.0_1
+libefa.so.1 rdma-core-43.0_1
+libibmad.so.5 rdma-core-43.0_1
 libibumad.so.3 rdma-core-22.1_1
 libibverbs.so.1 rdma-core-22.1_1
+libmlx4.so.1 rdma-core-43.0_1
+libmlx5.so.1 rdma-core-43.0_1
 librdmacm.so.1 rdma-core-22.1_1
 libdvdcss.so.2 libdvdcss-1.4.2_1
 libvalapanel.so.0 vala-panel-0.4.87_1
diff --git a/srcpkgs/rdma-core/patches/manpages.patch b/srcpkgs/rdma-core/patches/manpages.patch
new file mode 100644
index 000000000000..d9bc9ecd00e8
--- /dev/null
+++ b/srcpkgs/rdma-core/patches/manpages.patch
@@ -0,0 +1,22 @@
+Install manpages not depending on pandoc and rst2man.
+
+--- a/buildlib/rdma_man.cmake
++++ b/buildlib/rdma_man.cmake
+@@ -68,7 +68,7 @@ endfunction()
+ # filename
+ function(rdma_man_pages)
+   foreach(I ${ARGN})
+-    if ("${I}" MATCHES "\\.md$")
++    if ("${I}" MATCHES "\\.md$" AND PANDOC_FOUND)
+       string(REGEX REPLACE "^.+[.](.+)\\.md$" "\\1" MAN_SECT "${I}")
+       string(REGEX REPLACE "^(.+)\\.md$" "\\1" BASE_NAME "${I}")
+       get_filename_component(BASE_NAME "${BASE_NAME}" NAME)
+@@ -77,7 +77,7 @@ function(rdma_man_pages)
+ 	"${I}"
+ 	"${MAN_SECT}"
+ 	"${BASE_NAME}")
+-    elseif ("${I}" MATCHES "\\.in\\.rst$")
++    elseif ("${I}" MATCHES "\\.in\\.rst$" AND RST2MAN_FOUND)
+       string(REGEX REPLACE "^.+[.](.+)\\.in\\.rst$" "\\1" MAN_SECT "${I}")
+       string(REGEX REPLACE "^(.+)\\.in\\.rst$" "\\1" BASE_NAME "${I}")
+       get_filename_component(BASE_NAME "${BASE_NAME}" NAME)
diff --git a/srcpkgs/rdma-core/template b/srcpkgs/rdma-core/template
index e7172aa4977a..250684baaa50 100644
--- a/srcpkgs/rdma-core/template
+++ b/srcpkgs/rdma-core/template
@@ -1,20 +1,22 @@
 # Template file for 'rdma-core'
 pkgname=rdma-core
-version=23.3
-revision=2
+version=43.0
+revision=1
 build_style=cmake
-configure_args="-DENABLE_VALGRIND=OFF"
-hostmakedepends="pkg-config python3"
+configure_args="-DENABLE_VALGRIND=OFF
+ -DCMAKE_INSTALL_MODPROBEDIR=/usr/lib/modprobe.d"
+hostmakedepends="pkg-config python3 $(vopt_if docs 'pandoc python3-docutils')"
 makedepends="libnl3-devel eudev-libudev-devel python3-devel"
 short_desc="RDMA core userspace libraries and daemons"
 maintainer="Rich G <rich@richgannon.net>"
 license="GPL-2.0-or-later, BSD-2-Clause, MIT"
 homepage="https://github.com/linux-rdma/rdma-core"
 distfiles="https://github.com/linux-rdma/rdma-core/releases/download/v${version}/rdma-core-${version}.tar.gz"
-checksum=0afb7aa2654ea914c3b5d12e6e8f2fc3f325b0a52da1febf4f66788bf0b2bb14
+checksum=05ae494efb2b6c86f9586ce75a9c959995cb4b122fcb36ed4a32f96c9650017d
+build_options="docs"
+desc_option_docs="Enable documentation"
 
-conf_files="
- /etc/iwpmd.conf
+conf_files="/etc/iwpmd.conf
  /etc/srp_daemon.conf
  /etc/rdma/modules/infiniband.conf
  /etc/rdma/modules/iwarp.conf
@@ -24,13 +26,13 @@ conf_files="
  /etc/rdma/modules/roce.conf
  /etc/rdma/modules/srp_daemon.conf"
 
-post_install() {
-	# Fix path of udev rule
-	mv ${DESTDIR}/etc/udev/rules.d/70-persistent-ipoib.rules \
-		${DESTDIR}/usr/lib/udev/rules.d
+case "$XBPS_MACHINE" in
+	x86_64*|i686*|ppc64le*|ppc64) build_options_default="docs" ;;
+esac
 
-	# Fix location of modprobe.d files
-	mv ${DESTDIR}/etc/modprobe.d ${DESTDIR}/usr/lib
+post_install() {
+	# not needed
+	rm -rf ${DESTDIR}/usr/lib/systemd ${DESTDIR}/etc/init.d
 
 	vlicense COPYING.BSD_FB
 	vlicense COPYING.BSD_MIT

From aae342201d6abea84c473058ffc0e7b5c34581d6 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Mon, 5 Dec 2022 17:53:57 +0300
Subject: [PATCH 2/2] libibmad: remove package

Merged with rdma-core, obsoleted by upstream.
---
 srcpkgs/libibmad-devel            |  1 -
 srcpkgs/libibmad/template         | 22 ----------------------
 srcpkgs/removed-packages/template |  2 ++
 3 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 120000 srcpkgs/libibmad-devel
 delete mode 100644 srcpkgs/libibmad/template

diff --git a/srcpkgs/libibmad-devel b/srcpkgs/libibmad-devel
deleted file mode 120000
index 8c7ec3317f6a..000000000000
--- a/srcpkgs/libibmad-devel
+++ /dev/null
@@ -1 +0,0 @@
-libibmad
\ No newline at end of file
diff --git a/srcpkgs/libibmad/template b/srcpkgs/libibmad/template
deleted file mode 100644
index 5fa806d81c1d..000000000000
--- a/srcpkgs/libibmad/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'libibmad'
-pkgname=libibmad
-version=1.3.13
-revision=1
-build_style=gnu-configure
-makedepends="rdma-core-devel"
-short_desc="OpenFabrics Alliance InfiniBand diagnostic and management library"
-maintainer="Rich Gannon <rich@richgannon.net>"
-license="GPL-2.0-or-later"
-homepage="https://openfabrics.org"
-distfiles="https://www.openfabrics.org/downloads/management/libibmad-${version}.tar.gz"
-checksum=17cdd721c81fecefc366601c46c55a4d44c93799980a0a34c271b12bc544520b
-
-libibmad-devel_package() {
-	depends="libibmad-${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 04a018dc1435..82991e52e046 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -264,6 +264,8 @@ replaces="
  libglademm<=2.6.7_6
  libglib-static<=2.58.3_5
  libgtkhtml<=4.10.0_1
+ libibmad<=1.3.13_1
+ libibmad-devel<=1.3.13_1
  liblrzip<=0.641_1
  libmagick6-devel<=6.9.12.12_2
  libmagick6-perl<=6.9.12.12_2