gentoo resync : 02.02.2022

2 files changed, 30 insertions, 54 deletions

diff --git a/sys-cluster/rdma-core/files/optional_pandoc.patch b/sys-cluster/rdma-core/files/optional_pandoc.patch
deleted file mode 100644
index 4ed0e3a63ef4..000000000000
--- a/sys-cluster/rdma-core/files/optional_pandoc.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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.000000000 +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/files/rdma-core-38.0-musl.patch b/sys-cluster/rdma-core/files/rdma-core-38.0-musl.patch
new file mode 100644
index 000000000000..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 <soap@gentoo.org>
+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
+