[gentoo-commits] repo/gentoo:master commit in: sys-cluster/rdma-core/, sys-cluster/rdma-core/files/

2022-03-11 Thread David Seifert
commit: 40028674bea386ed66259ade6807430a4dab7683
Author: David Seifert  gentoo  org>
AuthorDate: Fri Mar 11 09:41:39 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Mar 11 09:41:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40028674

sys-cluster/rdma-core: add 39.0

Signed-off-by: David Seifert  gentoo.org>

 sys-cluster/rdma-core/Manifest |  1 +
 .../files/rdma-core-39.0-RDMA_BuildType.patch  | 12 +++
 sys-cluster/rdma-core/rdma-core-39.0.ebuild| 96 ++
 3 files changed, 109 insertions(+)

diff --git a/sys-cluster/rdma-core/Manifest b/sys-cluster/rdma-core/Manifest
index 95a3fc29ed37..6d54badbb34f 100644
--- a/sys-cluster/rdma-core/Manifest
+++ b/sys-cluster/rdma-core/Manifest
@@ -1 +1,2 @@
 DIST rdma-core-38.0.tar.gz 1760189 BLAKE2B 
ab028ce9367353201748f19d05d4d02170920b155b7ebb3584043729422e377cfb4ae29ed442ce7f965faa2470fe558499e9b2e7da51f282fa65ab029d4bcaa9
 SHA512 
98b3e3d26675891d54652817851f172855443faf6950b5c17177f10f5b3b197778590ad0e9640ecceaba17cf4aceb276ddb145ab46c1f6af9d2f6954688c3239
+DIST rdma-core-39.0.tar.gz 1762652 BLAKE2B 
7fed2be57624451c660120c6360fedd15ffaff36608879a329c3f078b647cb325c94fc949ef14f99b3be8b43ffddee6759e7da2f88287adf4dee413658afb5db
 SHA512 
a003cae24cff6791a6281b1ab7cc1823fb08a74e03231bf846f8ebbd5fa447c8dd900357493108f6a2b22fd5dabd657fe42e1ce2f65a01746ce47a3222815459

diff --git a/sys-cluster/rdma-core/files/rdma-core-39.0-RDMA_BuildType.patch 
b/sys-cluster/rdma-core/files/rdma-core-39.0-RDMA_BuildType.patch
new file mode 100644
index ..969028358733
--- /dev/null
+++ b/sys-cluster/rdma-core/files/rdma-core-39.0-RDMA_BuildType.patch
@@ -0,0 +1,12 @@
+* RDMA_BuildType() tries to muck with CMAKE_BUILD_TYPE
+
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -199,7 +199,6 @@
+ 
+ #-
+ # Setup the basic C compiler
+-RDMA_BuildType()
+ include_directories(${BUILD_INCLUDE})
+ 
+ # Look for Python. We prefer some variant of python 3 if the system has it.

diff --git a/sys-cluster/rdma-core/rdma-core-39.0.ebuild 
b/sys-cluster/rdma-core/rdma-core-39.0.ebuild
new file mode 100644
index ..fec7d02b8032
--- /dev/null
+++ b/sys-cluster/rdma-core/rdma-core-39.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-single-r1 udev systemd
+
+DESCRIPTION="Userspace components for the Linux Kernel's drivers/infiniband 
subsystem"
+HOMEPAGE="https://github.com/linux-rdma/rdma-core;
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core;
+else
+   SRC_URI="https://github.com/linux-rdma/rdma-core/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+fi
+
+LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"
+SLOT="0"
+IUSE="neigh python static-libs systemd valgrind"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+   virtual/libudev:=
+   neigh? ( dev-libs/libnl:3 )
+   systemd? ( sys-apps/systemd:= )
+   valgrind? ( dev-util/valgrind )
+   python? ( ${PYTHON_DEPS} )"
+
+DEPEND="${COMMON_DEPEND}
+   python? (
+   $(python_gen_cond_dep '
+   dev-python/cython[${PYTHON_USEDEP}]
+   ')
+   )"
+
+RDEPEND="${COMMON_DEPEND}
+   !sys-fabric/infiniband-diags
+   !sys-fabric/libibverbs
+   !sys-fabric/librdmacm
+   !sys-fabric/libibumad
+   !sys-fabric/ibacm
+   !sys-fabric/libibmad
+   !sys-fabric/srptools
+   !sys-fabric/infinipath-psm
+   !sys-fabric/libcxgb3
+   !sys-fabric/libcxgb4
+   !sys-fabric/libmthca
+   !sys-fabric/libmlx4
+   !sys-fabric/libmlx5
+   !sys-fabric/libocrdma
+   !sys-fabric/libnes"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-39.0-RDMA_BuildType.patch )
+
+pkg_setup() {
+   use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc
+   -DCMAKE_INSTALL_RUNDIR=/run
+   -DCMAKE_INSTALL_SHAREDSTATEDIR="${EPREFIX}"/var/lib
+   -DCMAKE_INSTALL_UDEV_RULESDIR="${EPREFIX}$(get_udevdir)"/rules.d
+   
-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)"
+   -DCMAKE_DISABLE_FIND_PACKAGE_Systemd="$(usex !systemd)"
+   -DENABLE_VALGRIND="$(usex valgrind)"
+   -DENABLE_RESOLVE_NEIGH="$(usex neigh)"
+   -DENABLE_STATIC="$(usex static-libs)"
+   -DNO_PYVERBS="$(usex !python)"
+   -DNO_MAN_PAGES=1
+   )
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+
+   udev_dorules 

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/rdma-core/, sys-cluster/rdma-core/files/

2022-01-29 Thread David Seifert
commit: 59c64f758812d6989adc97939863b41178e48348
Author: David Seifert  gentoo  org>
AuthorDate: Sat Jan 29 11:02:18 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jan 29 11:02:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59c64f75

sys-cluster/rdma-core: fix build on musl

Closes: https://bugs.gentoo.org/828894
Signed-off-by: David Seifert  gentoo.org>

 .../rdma-core/files/rdma-core-38.0-musl.patch  | 30 ++
 sys-cluster/rdma-core/rdma-core-38.0.ebuild|  2 ++
 2 files changed, 32 insertions(+)

diff --git a/sys-cluster/rdma-core/files/rdma-core-38.0-musl.patch 
b/sys-cluster/rdma-core/files/rdma-core-38.0-musl.patch
new file mode 100644
index ..b3f92bfaa1a3
--- /dev/null
+++ b/sys-cluster/rdma-core/files/rdma-core-38.0-musl.patch
@@ -0,0 +1,30 @@
+From cf11c3d888ae49374ed2d4871560c82e4639b85b Mon Sep 17 00:00:00 2001
+From: David Seifert 
+Date: Sat, 29 Jan 2022 11:57:38 +0100
+Subject: [PATCH] Do not use `__THROW` in prototypes
+
+`__THROW` is a glibc-internal macro, as indicated by the
+preceding double underscore. The absence of this macro breaks
+builds on musl.
+
+Bug: https://bugs.gentoo.org/828894
+---
+ libibverbs/neigh.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libibverbs/neigh.c b/libibverbs/neigh.c
+index fa3cbf57..7eed95f1 100644
+--- a/libibverbs/neigh.c
 b/libibverbs/neigh.c
+@@ -30,7 +30,7 @@
+ #if !HAVE_WORKING_IF_H
+ /* We need this decl from net/if.h but old systems do not let use co-include
+net/if.h and netlink/route/link.h */
+-extern unsigned int if_nametoindex(__const char *__ifname) __THROW;
++extern unsigned int if_nametoindex(__const char *__ifname);
+ #endif
+ 
+ /* for PFX */
+-- 
+2.35.0
+

diff --git a/sys-cluster/rdma-core/rdma-core-38.0.ebuild 
b/sys-cluster/rdma-core/rdma-core-38.0.ebuild
index d25ddc3d8951..413f2aac21ed 100644
--- a/sys-cluster/rdma-core/rdma-core-38.0.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-38.0.ebuild
@@ -56,6 +56,8 @@ RDEPEND="${COMMON_DEPEND}
 
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/${P}-musl.patch )
+
 pkg_setup() {
use python && python-single-r1_pkg_setup
 



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/rdma-core/, sys-cluster/rdma-core/files/

2019-09-13 Thread Mikle Kolyada
commit: 76aaea7d5b986c9f5832993016404047422f50f9
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Sep 13 15:08:34 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Sep 13 15:11:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76aaea7d

sys-cluster/rdma-core: Version bump (v25.0)

- make pandoc optional (otherwise 25.0 fails to build)
- point correct SHAREDSTATEDIR

Closes: https://bugs.gentoo.org/694158
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Mikle Kolyada  gentoo.org>

 sys-cluster/rdma-core/Manifest |  1 +
 sys-cluster/rdma-core/files/optional_pandoc.patch  | 54 ++
 sys-cluster/rdma-core/rdma-core-24.0.ebuild|  1 +
 ...rdma-core-24.0.ebuild => rdma-core-25.0.ebuild} |  3 ++
 sys-cluster/rdma-core/rdma-core-.ebuild|  1 +
 5 files changed, 60 insertions(+)

diff --git a/sys-cluster/rdma-core/Manifest b/sys-cluster/rdma-core/Manifest
index 195599ddb95..923dc163552 100644
--- a/sys-cluster/rdma-core/Manifest
+++ b/sys-cluster/rdma-core/Manifest
@@ -1 +1,2 @@
 DIST rdma-core-24.0.tar.gz 1219485 BLAKE2B 
400076305ca634a14d8f46df3477f9e3e753b95840237a217cfffe1a78e93ee90994e628f2a0693bde588ce15965df0014acb55bc92c36e3c45011cc69e9898a
 SHA512 
0ef2b2b4250a1738adec964911a286f60e2310472c943dac1be45c70974a8bd1f32ee96013bff9e492132403af810aee1350d404a87ae7671731f7a5bd80c655
+DIST rdma-core-25.0.tar.gz 1494005 BLAKE2B 
406926ae57ae4914a77c82025906270bbc45632ed1e0ecb44b1662d797066bf27275c8b4c4bee40795880bdb4ed06f8f9d3714cfffc64132c00395328ee0527f
 SHA512 
b2c6eaf16f89fb913e35b0eb602f60e8bf45979673597c34006ed78c2e671cf1e50b1cc0752740dc474a58fc94eb0c3f66175183e6b903605ff1512469ceef38

diff --git a/sys-cluster/rdma-core/files/optional_pandoc.patch 
b/sys-cluster/rdma-core/files/optional_pandoc.patch
new file mode 100644
index 000..4ed0e3a63ef
--- /dev/null
+++ b/sys-cluster/rdma-core/files/optional_pandoc.patch
@@ -0,0 +1,54 @@
+The master "CMakeLists.txt" listed "pandoc" as an optional dependency,
+but subsequent "make install" fails if "pandoc" is missing.
+This patch makes "pandoc" really optional.
+diff -ru rdma-core-25.0.orig/CMakeLists.txt rdma-core-25.0/CMakeLists.txt
+--- a/CMakeLists.txt   2019-07-26 02:17:21.0 +0800
 b/CMakeLists.txt   2019-07-31 00:08:41.485085990 +0800
+@@ -602,11 +602,17 @@
+ add_subdirectory(kernel-headers)
+ # Libraries
+ add_subdirectory(libibumad)
++if (PANDOC_FOUND)
+ add_subdirectory(libibumad/man)
++endif()
+ add_subdirectory(libibverbs)
++if (PANDOC_FOUND)
+ add_subdirectory(libibverbs/man)
++endif()
+ add_subdirectory(librdmacm)
++if (PANDOC_FOUND)
+ add_subdirectory(librdmacm/man)
++endif()
+ 
+ # Providers
+ if (HAVE_COHERENT_DMA)
+@@ -614,13 +620,19 @@
+ add_subdirectory(providers/cxgb3) # NO SPARSE
+ add_subdirectory(providers/cxgb4) # NO SPARSE
+ add_subdirectory(providers/efa)
++if (PANDOC_FOUND)
+ add_subdirectory(providers/efa/man)
++endif()
+ add_subdirectory(providers/hns)
+ add_subdirectory(providers/i40iw) # NO SPARSE
+ add_subdirectory(providers/mlx4)
++if (PANDOC_FOUND)
+ add_subdirectory(providers/mlx4/man)
++endif()
+ add_subdirectory(providers/mlx5)
++if (PANDOC_FOUND)
+ add_subdirectory(providers/mlx5/man)
++endif()
+ add_subdirectory(providers/mthca)
+ add_subdirectory(providers/nes) # NO SPARSE
+ add_subdirectory(providers/ocrdma)
+@@ -639,7 +651,9 @@
+ add_subdirectory(libibnetdisc/man)
+ add_subdirectory(infiniband-diags)
+ add_subdirectory(infiniband-diags/scripts)
++if (PANDOC_FOUND)
+ add_subdirectory(infiniband-diags/man)
++endif()
+ 
+ if (CYTHON_EXECUTABLE)
+   add_subdirectory(pyverbs)

diff --git a/sys-cluster/rdma-core/rdma-core-24.0.ebuild 
b/sys-cluster/rdma-core/rdma-core-24.0.ebuild
index fb16737ff02..f50ad59a5b0 100644
--- a/sys-cluster/rdma-core/rdma-core-24.0.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-24.0.ebuild
@@ -61,6 +61,7 @@ src_configure() {
local mycmakeargs=(
-DCMAKE_INSTALL_SYSCONFDIR=/etc
-DCMAKE_INSTALL_FULL_RUNDIR=/run
+   -DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib
-DCMAKE_INSTALL_UDEV_RULESDIR="$(get_udevdir)"/rules.d

-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)"
-DCMAKE_DISABLE_FIND_PACKAGE_pandoc=yes

diff --git a/sys-cluster/rdma-core/rdma-core-24.0.ebuild 
b/sys-cluster/rdma-core/rdma-core-25.0.ebuild
similarity index 96%
copy from sys-cluster/rdma-core/rdma-core-24.0.ebuild
copy to sys-cluster/rdma-core/rdma-core-25.0.ebuild
index fb16737ff02..c2d102716c9 100644
--- a/sys-cluster/rdma-core/rdma-core-24.0.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-25.0.ebuild
@@ -52,6 +52,8 @@ RDEPEND="${COMMON_DEPEND}
 
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/optional_pandoc.patch )
+
 pkg_setup() {
python-single-r1_pkg_setup
 
@@ -61,6 +63,7 @@ src_configure() {
local mycmakeargs=(
-DCMAKE_INSTALL_SYSCONFDIR=/etc
  

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/rdma-core/, sys-cluster/rdma-core/files/

2019-09-08 Thread Mikle Kolyada
commit: 9b83bcf936bc5b844cf785979dc631940d147a7d
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Sep  8 10:50:05 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Sep  8 10:55:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b83bcf9

sys-cluster/rdma-core: initial commit

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Mikle Kolyada  gentoo.org>

 sys-cluster/rdma-core/Manifest  |  1 +
 sys-cluster/rdma-core/files/ibacm.init  |  7 +++
 sys-cluster/rdma-core/files/iwpmd.init  |  7 +++
 sys-cluster/rdma-core/files/srpd.init   | 20 +++
 sys-cluster/rdma-core/metadata.xml  | 16 +
 sys-cluster/rdma-core/rdma-core-24.0.ebuild | 92 +
 sys-cluster/rdma-core/rdma-core-.ebuild | 91 
 7 files changed, 234 insertions(+)

diff --git a/sys-cluster/rdma-core/Manifest b/sys-cluster/rdma-core/Manifest
new file mode 100644
index 000..195599ddb95
--- /dev/null
+++ b/sys-cluster/rdma-core/Manifest
@@ -0,0 +1 @@
+DIST rdma-core-24.0.tar.gz 1219485 BLAKE2B 
400076305ca634a14d8f46df3477f9e3e753b95840237a217cfffe1a78e93ee90994e628f2a0693bde588ce15965df0014acb55bc92c36e3c45011cc69e9898a
 SHA512 
0ef2b2b4250a1738adec964911a286f60e2310472c943dac1be45c70974a8bd1f32ee96013bff9e492132403af810aee1350d404a87ae7671731f7a5bd80c655

diff --git a/sys-cluster/rdma-core/files/ibacm.init 
b/sys-cluster/rdma-core/files/ibacm.init
new file mode 100644
index 000..719accfa95c
--- /dev/null
+++ b/sys-cluster/rdma-core/files/ibacm.init
@@ -0,0 +1,7 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/ibacm"
+pidfile="/run/${SVCNAME}.pid"
+start_stop_daemon_args="-b -m"

diff --git a/sys-cluster/rdma-core/files/iwpmd.init 
b/sys-cluster/rdma-core/files/iwpmd.init
new file mode 100644
index 000..b1ffa33fcc8
--- /dev/null
+++ b/sys-cluster/rdma-core/files/iwpmd.init
@@ -0,0 +1,7 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/iwpmd"
+pidfile="/run/${SVCNAME}.pid"
+start_stop_daemon_args="-b -m"

diff --git a/sys-cluster/rdma-core/files/srpd.init 
b/sys-cluster/rdma-core/files/srpd.init
new file mode 100644
index 000..c54e5d81ed5
--- /dev/null
+++ b/sys-cluster/rdma-core/files/srpd.init
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/srp_daemon.sh"
+pidfile="/run/${SVCNAME}.pid"
+start_stop_daemon_args="-b -m"
+
+rdma_config="/etc/infiniband/openib.conf"
+[ -f ${rdma_config} ] && source ${rdma_config}"
+
+[ ${SRP_DEFAULT_TL_RETRY_COUNT} ] && command_args="-l 
${SRP_DEFAULT_TL_RETRY_COUNT}"
+
+start_pre() {
+   if ! [ -e /sys/module/ib_srp ]; then
+   eerror "SRP kernel module is not loaded, unable to start SRP 
daemon"
+   return 1
+   fi
+   return 0
+}

diff --git a/sys-cluster/rdma-core/metadata.xml 
b/sys-cluster/rdma-core/metadata.xml
new file mode 100644
index 000..25b5861a759
--- /dev/null
+++ b/sys-cluster/rdma-core/metadata.xml
@@ -0,0 +1,16 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+zlog...@gentoo.org
+Mikle Kolyada
+
+
+Enable iwpmd support
+Enable pyverbs support
+Enable valgrind notations
+
+
+linux-rdma/rdma-core
+
+

diff --git a/sys-cluster/rdma-core/rdma-core-24.0.ebuild 
b/sys-cluster/rdma-core/rdma-core-24.0.ebuild
new file mode 100644
index 000..fb16737ff02
--- /dev/null
+++ b/sys-cluster/rdma-core/rdma-core-24.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit cmake-utils python-single-r1 udev systemd
+
+DESCRIPTION="Userspace components for the Linux Kernel's drivers/infiniband 
subsystem"
+HOMEPAGE="https://github.com/linux-rdma/rdma-core;
+
+if [[ ${PV} == "" ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core;
+else
+   
SRC_URI="https://github.com/linux-rdma/rdma-core/releases/download/v${PV}/${P}.tar.gz;
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"
+SLOT="0"
+IUSE="neigh python static-libs systemd valgrind"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+   virtual/libudev:=
+   neigh? ( dev-libs/libnl:3 )
+   systemd? ( sys-apps/systemd:= )
+   valgrind? ( dev-util/valgrind )
+   python? ( ${PYTHON_DEPS} )"
+
+DEPEND="${COMMON_DEPEND}
+   python? ( dev-python/cython[${PYTHON_USEDEP}] )"
+
+RDEPEND="${COMMON_DEPEND}
+   !sys-fabric/infiniband-diags
+   !sys-fabric/libibverbs
+