diff options
Diffstat (limited to 'sys-cluster')
-rw-r--r-- | sys-cluster/Manifest.gz | bin | 11571 -> 11568 bytes | |||
-rw-r--r-- | sys-cluster/rdma-core/Manifest | 3 | ||||
-rw-r--r-- | sys-cluster/rdma-core/files/rdma-core-53.1-preload-fix-build-issue-with-clang-19.patch | 162 | ||||
-rw-r--r-- | sys-cluster/rdma-core/rdma-core-53.1.ebuild | 3 |
4 files changed, 166 insertions, 2 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz Binary files differindex e0bd16682f74..7787a2440594 100644 --- a/sys-cluster/Manifest.gz +++ b/sys-cluster/Manifest.gz diff --git a/sys-cluster/rdma-core/Manifest b/sys-cluster/rdma-core/Manifest index 77adfcb875a5..601eb2e184af 100644 --- a/sys-cluster/rdma-core/Manifest +++ b/sys-cluster/rdma-core/Manifest @@ -2,11 +2,12 @@ AUX ibacm.init 205 BLAKE2B 3e955dbdb0f5fa24323ebca526a2a381e0aed49ac7a8a65ed1880 AUX iwpmd.init 205 BLAKE2B a876a969b02c20bdb4f6a3dbf433a7ed3b5dccacf44821c825d8ab5a4fc33d7d60e01e6b265317ce6029b96927448506622c86047dfc1901b2bd1fbf8644735f SHA512 b011797925b89554a90d834a3da2d65ba3b8962f639184bbe72de98f204fe207a76073686178ee8b8456c3a6ee690bb56acfd68e02b090b99c35c55cb44d0cd7 AUX rdma-core-39.0-RDMA_BuildType.patch 314 BLAKE2B 86a44ca599ad3e02908640d469500899de27fe874c3bb49c87589bb36d0aebff097e941eb8e76f365251fca3344eecc3520fe2005a0bedc4aeeec2f0003b6edf SHA512 fc3594e8160710f12f83279ee03193e8dd03c6318d67054f61c696d2b5946bfb1907481d53200391328cc37ca5a6e80537d4d70ee52a77ac6bbfb8836d39fbb6 AUX rdma-core-50.0-use-posix-version-of-basename.patch 2155 BLAKE2B 55686cf10798f3bec0dbe21e50075476b6f0732c4483a4d06d97185c2b7982afcbaa9f60c5a20815c8c7eb037c66992a0ce246d9b9ea1bd21228bf2751144cb5 SHA512 f4a7c8d207255428723da1d6fbf56ca90b07fad46d3ba42fc9e7cdb42411a70c83bf47dcee650536dd22aacdc18b7ddc0f463459de06c24883f500e6129494f9 +AUX rdma-core-53.1-preload-fix-build-issue-with-clang-19.patch 5011 BLAKE2B 110437f37a1cbcc6efd6af829af7bd5ec7c95d6589abd51dcdd4b55eb7aef2560a0b5facf0014607980af5d2c92773d09efd60e9aa43b7b607ce6b5161eaba8c SHA512 e565e2e68dc58a282f1e9b82f3de7adef699ee8678d9ce6fd42c79ed8357dea36f4d9733c3f1b6e37da43aaa6f02cdc74a759ee47355917243e21726f5464188 AUX srpd.init 535 BLAKE2B 71b1c00f804ad2d5d5919044eda7dfd5ca273a8bbb2debe31cf7759b6122007f5dca5da521eca882a4c48011a9cf78433c7a0fbda4a9d7d39ab89fb6f72b44f7 SHA512 3fdeb9cf5cddcf9a9fcb516c757eb82aee6eb3651e43b8579ed4a909f9b90863400e1a1bde46bb3a3ce6aeb477c40709c828739c87b3fa80d2bd8d179fcd295d DIST rdma-core-50.0.tar.gz 1961247 BLAKE2B e17857eae1cebea7f82d061a41905577088c553f18f7aacfc7901e13e890a0b5bb2a776140e603b41c8a45d6690e27852f291bd0cc0b839c469c2caeb0854bb3 SHA512 0d341300dde2a8756ab0e80bf8d316627c997e85661d50b51897aa03e1b7326f4ca7a6f24e370354779482a2d9455e58dbb07e6292ed8b511e7f195e4e2d1850 DIST rdma-core-53.1.tar.gz 2170895 BLAKE2B d4ab2785aa9e3f3d349bfeeb0ed3354f44c43f730c5988ca8de6489ee41de9c6fa57d157931b424031fba85ec6cc7a4b3befcf9a10ed7d302f26a95d22478f16 SHA512 d786c6854093fbc1b876aec068ea87d0e5cc2a217c19e515cf48ba2fb7018f3da60b9cd6f204b6f04c1b295fec47ddafdca330cb734a0df7b6d7631d77cca0a9 EBUILD rdma-core-50.0-r1.ebuild 2969 BLAKE2B 457f5a45123341bfe5365fe42fda80f06326e50655a7fc72fb375bb3241d0b463450c0621cdf8aee54d83fe87814a806a8b6bb432bb7ccdd8fc443d61e6b9581 SHA512 505c83bbef23d322571208d215e3ef30013a37d4707ec288c3a617b21a00c6fce7a157ec470b0b64e1de7a771628a67333eb119ed647e0d8be2d5d0c59a50352 EBUILD rdma-core-50.0.ebuild 2907 BLAKE2B 3de64171b455cacb15f9675c378c475d2e3b52c354b07806691f21583b8e1a482b7b78162cc5ab058c8f42127704980f93e916cd265c326351302994dabbc260 SHA512 7a1f25f538d7176de6cc096bc9b530673d6371f7ebfbf926511c7b230bcd1e0b8bc55dc70cbd95bdd937a1e9926c1b62f8bf9e7f65a0d71b570fafa2f8f789f8 -EBUILD rdma-core-53.1.ebuild 2907 BLAKE2B 3de64171b455cacb15f9675c378c475d2e3b52c354b07806691f21583b8e1a482b7b78162cc5ab058c8f42127704980f93e916cd265c326351302994dabbc260 SHA512 7a1f25f538d7176de6cc096bc9b530673d6371f7ebfbf926511c7b230bcd1e0b8bc55dc70cbd95bdd937a1e9926c1b62f8bf9e7f65a0d71b570fafa2f8f789f8 +EBUILD rdma-core-53.1.ebuild 2977 BLAKE2B 8c229c65888f5410f838d3a62f3ab9d9e5bb241da94067b29df0811ea2eb13d3a3ee7db2a64ee16defd10ff147fbc3eed8b2e47e7d764c82d3f8a3e60ad1546e SHA512 1e4eed2642e0923432395f0063bda70708bcd67487a3d9ba6bb5b7ac81d8d5c6168ea919bb34fccd739c393b0cb8136e4900ed1a7a02eb2cc551427b7452081d EBUILD rdma-core-9999.ebuild 2711 BLAKE2B f51858224e037c905a98649fb3fd322f92cb72998fd8f44a71a466d84754078ec9e811205a63a660669a2bbe7bffe9efb578b246620e7c921a4b16e04f10ff62 SHA512 ecc7d2ab7c49429335f24b2f63b4d89af91c696a7ad666731699efbaede83560a3086f944cd1318ba94833b5d30fbec4ca34ee00ff50711f4520b75dd2e6a1be MISC metadata.xml 523 BLAKE2B 31562c17af5b7350935fdaa623ba3dafede153fb374176f1896e16fd628f8f4e33e2f0fbc0a70bb94e11c90ba04f7e702d0d6de0d8999d20e09155a02d7b6bf9 SHA512 4c818b0ac56251d93463e3681245661c32b1df370ac563013ee0907038ca4084a722ceab89cfdaddef7d632d5862ac2c4365ff57133fcdc087ca19660e64c041 diff --git a/sys-cluster/rdma-core/files/rdma-core-53.1-preload-fix-build-issue-with-clang-19.patch b/sys-cluster/rdma-core/files/rdma-core-53.1-preload-fix-build-issue-with-clang-19.patch new file mode 100644 index 000000000000..8f4e7dc93523 --- /dev/null +++ b/sys-cluster/rdma-core/files/rdma-core-53.1-preload-fix-build-issue-with-clang-19.patch @@ -0,0 +1,162 @@ +From 660479ab1ac25a016e07634c1313427489bb6747 Mon Sep 17 00:00:00 2001 +From: "Z. Liu" <zhixu.liu@gmail.com> +Date: Mon, 3 Mar 2025 22:40:15 +0800 +Subject: [PATCH 1/4] preload: fix build issue with clang 19 + +librdmacm/preload.c:796:9: error: at most one overload for a given name may lack the 'overloadable' attribute +librdmacm/preload.c:796:9: warning: no previous prototype for function 'recvfrom' [-Wmissing-prototypes] + +Signed-off-by: Z. Liu <zhixu.liu@gmail.com> +--- + CMakeLists.txt | 7 +++++++ + buildlib/config.h.in | 2 ++ + librdmacm/preload.c | 9 +++++++++ + 3 files changed, 18 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7f5b4139b..26d658830 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -394,6 +394,13 @@ if (NOT HAVE_LONG_LONG_U64) + add_definitions("-D__SANE_USERSPACE_TYPES__") + endif() + ++# Check __SOCKADDR_ARG exist and is union ++RDMA_Check_C_Compiles(HAVE_SOCKADDR_ARG_AS_UNION " ++#define _GNU_SOURCE ++#include <sys/socket.h> ++ int main(int argc,const char *argv[]) {struct sockaddr addr;__SOCKADDR_ARG sa; sa.__sockaddr__ = (struct sockaddr *)&addr; (void)addr; (void)sa; return 0;}" ++) ++ + # glibc and kernel uapi headers can co-exist + CHECK_C_SOURCE_COMPILES(" + #include <sys/socket.h> +diff --git a/buildlib/config.h.in b/buildlib/config.h.in +index c5b0bf557..663248041 100644 +--- a/buildlib/config.h.in ++++ b/buildlib/config.h.in +@@ -50,6 +50,8 @@ + + #cmakedefine HAVE_WORKING_IF_H 1 + ++#cmakedefine HAVE_SOCKADDR_ARG_AS_UNION 1 ++ + // Operating mode for symbol versions + #cmakedefine HAVE_FULL_SYMBOL_VERSIONS 1 + #cmakedefine HAVE_LIMITED_SYMBOL_VERSIONS 1 +diff --git a/librdmacm/preload.c b/librdmacm/preload.c +index d46beb1bb..b3175dd5d 100644 +--- a/librdmacm/preload.c ++++ b/librdmacm/preload.c +@@ -794,12 +794,21 @@ ssize_t recv(int socket, void *buf, size_t len, int flags) + } + + ssize_t recvfrom(int socket, void *buf, size_t len, int flags, ++#if HAVE_SOCKADDR_ARG_AS_UNION ++ __SOCKADDR_ARG src_addr, socklen_t *addrlen) ++#else + struct sockaddr *src_addr, socklen_t *addrlen) ++#endif + { + int fd; + return (fd_fork_get(socket, &fd) == fd_rsocket) ? ++#if HAVE_SOCKADDR_ARG_AS_UNION ++ rrecvfrom(fd, buf, len, flags, src_addr.__sockaddr__, addrlen) : ++ real.recvfrom(fd, buf, len, flags, src_addr.__sockaddr__, addrlen); ++#else + rrecvfrom(fd, buf, len, flags, src_addr, addrlen) : + real.recvfrom(fd, buf, len, flags, src_addr, addrlen); ++#endif + } + + ssize_t recvmsg(int socket, struct msghdr *msg, int flags) +-- +2.45.2 + + +From c13a26a463750f3bb3db5697069ee9e9bf5a5556 Mon Sep 17 00:00:00 2001 +From: "Z. Liu" <zhixu.liu@gmail.com> +Date: Wed, 5 Mar 2025 01:19:37 +0800 +Subject: [PATCH 2/4] libibverbs.map: ibv_cmd_query_device had been removed + +Signed-off-by: Z. Liu <zhixu.liu@gmail.com> +--- + libibverbs/libibverbs.map.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/libibverbs/libibverbs.map.in b/libibverbs/libibverbs.map.in +index 11268cefd..a473549ca 100644 +--- a/libibverbs/libibverbs.map.in ++++ b/libibverbs/libibverbs.map.in +@@ -222,7 +222,6 @@ IBVERBS_PRIVATE_@IBVERBS_PABI_VERSION@ { + ibv_cmd_post_send; + ibv_cmd_post_srq_recv; + ibv_cmd_query_context; +- ibv_cmd_query_device; + ibv_cmd_query_device_any; + ibv_cmd_query_mr; + ibv_cmd_query_port; +-- +2.45.2 + + +From f564d1938bc03eb3b5f1fe5d6fadf7be81d922a6 Mon Sep 17 00:00:00 2001 +From: "Z. Liu" <zhixu.liu@gmail.com> +Date: Wed, 5 Mar 2025 09:08:48 +0800 +Subject: [PATCH 3/4] libefa.map: efadv_wc_read_sgid is static inline + +Signed-off-by: Z. Liu <zhixu.liu@gmail.com> +--- + providers/efa/libefa.map | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/providers/efa/libefa.map b/providers/efa/libefa.map +index eff647d18..d27b58c16 100644 +--- a/providers/efa/libefa.map ++++ b/providers/efa/libefa.map +@@ -17,7 +17,6 @@ EFA_1.2 { + global: + efadv_cq_from_ibv_cq_ex; + efadv_create_cq; +- efadv_wc_read_sgid; + } EFA_1.1; + + EFA_1.3 { +-- +2.45.2 + + +From 25cf8775b956ef81034aa314c1470634ea9ab5d3 Mon Sep 17 00:00:00 2001 +From: "Z. Liu" <zhixu.liu@gmail.com> +Date: Fri, 7 Mar 2025 10:31:13 +0800 +Subject: [PATCH 4/4] cmake: add ${BUILD_INCLUDE} for __SOCKADDR_ARG test + +because the sparse check has sys/socket.h patched + +Signed-off-by: Z. Liu <zhixu.liu@gmail.com> +--- + CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 26d658830..dce05c78b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -395,11 +395,14 @@ if (NOT HAVE_LONG_LONG_U64) + endif() + + # Check __SOCKADDR_ARG exist and is union ++set(SAFE_CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES}") ++set(CMAKE_REQUIRED_INCLUDES "${BUILD_INCLUDE}") + RDMA_Check_C_Compiles(HAVE_SOCKADDR_ARG_AS_UNION " + #define _GNU_SOURCE + #include <sys/socket.h> + int main(int argc,const char *argv[]) {struct sockaddr addr;__SOCKADDR_ARG sa; sa.__sockaddr__ = (struct sockaddr *)&addr; (void)addr; (void)sa; return 0;}" + ) ++set(CMAKE_REQUIRED_INCLUDES "${SAFE_CMAKE_REQUIRED_INCLUDES}") + + # glibc and kernel uapi headers can co-exist + CHECK_C_SOURCE_COMPILES(" +-- +2.45.2 + diff --git a/sys-cluster/rdma-core/rdma-core-53.1.ebuild b/sys-cluster/rdma-core/rdma-core-53.1.ebuild index 2763cb3b564b..ea5c73640f5d 100644 --- a/sys-cluster/rdma-core/rdma-core-53.1.ebuild +++ b/sys-cluster/rdma-core/rdma-core-53.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -65,6 +65,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-39.0-RDMA_BuildType.patch + "${FILESDIR}"/${PN}-53.1-preload-fix-build-issue-with-clang-19.patch ) src_prepare() { |