Re: [PR PATCH] [Updated] rdma-core: update to 44.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 44.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: 5483 bytes --]

From 6224d479c18bde91f651c2c5e47f38df76163a54 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Mon, 2 Jan 2023 06:18:18 +0300
Subject: [PATCH] rdma-core: update to 44.0.

libibmad has been merged with this package and obsoleted upstream.
---
 srcpkgs/libibmad                         |  1 +
 srcpkgs/libibmad-devel                   |  2 +-
 srcpkgs/libibmad/template                | 22 -------------
 srcpkgs/rdma-core/patches/manpages.patch | 22 +++++++++++++
 srcpkgs/rdma-core/template               | 40 ++++++++++++++++--------
 5 files changed, 51 insertions(+), 36 deletions(-)
 create mode 120000 srcpkgs/libibmad
 delete mode 100644 srcpkgs/libibmad/template
 create mode 100644 srcpkgs/rdma-core/patches/manpages.patch

diff --git a/srcpkgs/libibmad b/srcpkgs/libibmad
new file mode 120000
index 000000000000..db560d07ba4b
--- /dev/null
+++ b/srcpkgs/libibmad
@@ -0,0 +1 @@
+rdma-core
\ No newline at end of file
diff --git a/srcpkgs/libibmad-devel b/srcpkgs/libibmad-devel
index 8c7ec3317f6a..36d5492005a9 120000
--- a/srcpkgs/libibmad-devel
+++ b/srcpkgs/libibmad-devel
@@ -1 +1 @@
-libibmad
\ No newline at end of file
+rdma-core-devel
\ 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/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..c58afd6deeea 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=44.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=25d6601e60f27bbcd75e07fe340400cb80e6c3c487679700535385cfc9d9858b
+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
@@ -46,3 +48,15 @@ rdma-core-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
+libibmad_package() {
+	depends="rdma-core>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}
+
+libibmad-devel_package() {
+	depends="rdma-core-devel>=${version}_${revision}"
+	short_desc+=" - development files (transitional dummy package)"
+	build_style=meta
+}