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

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

[Sam James]

commit:     e1d3c9af5679ed8e493e188620dafde21c012a0f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 15 01:52:58 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 15 01:54:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1d3c9af

sys-cluster/ucx: drop -Werror

Closes: https://bugs.gentoo.org/789762
Closes: https://bugs.gentoo.org/790341
Closes: https://bugs.gentoo.org/790332
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../ucx/files/ucx-1.10.0_rc5-drop-werror.patch     | 55 ++++++++++++++++++++++
 sys-cluster/ucx/ucx-1.10.0_rc5.ebuild              | 10 ++--
 2 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/sys-cluster/ucx/files/ucx-1.10.0_rc5-drop-werror.patch b/sys-cluster/ucx/files/ucx-1.10.0_rc5-drop-werror.patch
new file mode 100644
index 00000000000..7a6894fe619
--- /dev/null
+++ b/sys-cluster/ucx/files/ucx-1.10.0_rc5-drop-werror.patch
@@ -0,0 +1,55 @@
+https://bugs.gentoo.org/789762
+
+From 18df3302b256bce6f61d83a58b2afbc8d788ad5c Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 15 Jun 2021 01:40:48 +0000
+Subject: [PATCH] Drop -Werror
+
+---
+ bindings/java/src/main/native/Makefile.am | 2 +-
+ examples/Makefile.am                      | 2 +-
+ test/apps/sockaddr/Makefile.am            | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/bindings/java/src/main/native/Makefile.am b/bindings/java/src/main/native/Makefile.am
+index 73f9940..6616dae 100644
+--- a/bindings/java/src/main/native/Makefile.am
++++ b/bindings/java/src/main/native/Makefile.am
+@@ -64,7 +64,7 @@ libjucx_la_SOURCES = context.cc \
+                      ucs_constants.cc \
+                      worker.cc
+ 
+-libjucx_la_CXXFLAGS = -fPIC -DPIC -Werror -std=gnu++98
++libjucx_la_CXXFLAGS = -fPIC -DPIC -std=gnu++98
+ 
+ libjucx_la_LIBADD = $(topdir)/src/ucs/libucs.la \
+                     $(topdir)/src/uct/libuct.la \
+diff --git a/examples/Makefile.am b/examples/Makefile.am
+index 05cde27..76c3b18 100644
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -23,7 +23,7 @@ EXAMPLE_CUDA_CFLAGS = $(CFLAGS_PEDANTIC)
+ EXAMPLE_CUDA_CPPFLAGS =
+ endif
+ 
+-EXAMPLE_CCLD_FLAGS = -lucs -I$(includedir) -L$(libdir) -Wall -Werror -Wl,-rpath,$(libdir) \
++EXAMPLE_CCLD_FLAGS = -lucs -I$(includedir) -L$(libdir) -Wall -Wl,-rpath,$(libdir) \
+                      $(EXAMPLE_CUDA_LDFLAGS) $(EXAMPLE_CUDA_CPPFLAGS)
+ 
+ installcheck-local:
+diff --git a/test/apps/sockaddr/Makefile.am b/test/apps/sockaddr/Makefile.am
+index 7ce7a01..2e4ad47 100644
+--- a/test/apps/sockaddr/Makefile.am
++++ b/test/apps/sockaddr/Makefile.am
+@@ -12,7 +12,7 @@ noinst_HEADERS = \
+ 	sa_util.h
+ 
+ sa_CXXFLAGS = \
+-	-std=c++11 -g -Wall -Werror
++	-std=c++11 -Wall
+ 
+ sa_CPPFLAGS = $(BASE_CPPFLAGS)
+ 
+-- 
+2.32.0
+

diff --git a/sys-cluster/ucx/ucx-1.10.0_rc5.ebuild b/sys-cluster/ucx/ucx-1.10.0_rc5.ebuild
index 1d3c4a64a11..b1b15f27d9e 100644
--- a/sys-cluster/ucx/ucx-1.10.0_rc5.ebuild
+++ b/sys-cluster/ucx/ucx-1.10.0_rc5.ebuild
@@ -5,14 +5,14 @@ EAPI=7
 
 inherit autotools
 
+MY_PV=${PV/_/-}
 DESCRIPTION="Unified Communication X"
 HOMEPAGE="https://www.openucx.org"
-
-MY_PV=${PV/_/-}
 SRC_URI="https://github.com/openucx/ucx/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
 
-SLOT="0"
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+numa +openmp"
 
@@ -22,7 +22,9 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10.0_rc5-drop-werror.patch
+)
 
 src_prepare() {
 	default

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

[Sam James]

commit:     1cdce793e59c02894817d9bc1a383372ab43531e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  9 14:33:52 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep  9 14:34:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cdce793

sys-cluster/ucx: don't try to call rpm

Closes: https://bugs.gentoo.org/790338
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-cluster/ucx/files/ucx-1.13.0-no-rpm-sandbox.patch | 12 ++++++++++++
 sys-cluster/ucx/ucx-1.13.1.ebuild                     |  1 +
 2 files changed, 13 insertions(+)

diff --git a/sys-cluster/ucx/files/ucx-1.13.0-no-rpm-sandbox.patch b/sys-cluster/ucx/files/ucx-1.13.0-no-rpm-sandbox.patch
new file mode 100644
index 000000000000..c387d640dff6
--- /dev/null
+++ b/sys-cluster/ucx/files/ucx-1.13.0-no-rpm-sandbox.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/790338
+--- a/src/uct/ib/Makefile.am
++++ b/src/uct/ib/Makefile.am
+@@ -13,7 +13,7 @@ libuct_ib_la_CFLAGS   = $(BASE_CFLAGS)
+ libuct_ib_la_LIBADD   = $(top_builddir)/src/ucs/libucs.la \
+                         $(top_builddir)/src/uct/libuct.la
+ libuct_ib_la_LDFLAGS  = $(IBVERBS_LDFLAGS) $(NUMA_LIBS) -version-info $(SOVERSION)
+-libmlx5_ver           = $(shell (rpm -qf $(IBVERBS_DIR)/include/infiniband/mlx5_hw.h &>/dev/null && rpm -qf /usr/include/infiniband/mlx5_hw.h) | grep -v 'not owned' | head -1)
++libmlx5_ver           = $(shell (false -qf $(IBVERBS_DIR)/include/infiniband/mlx5_hw.h &>/dev/null && false -qf /usr/include/infiniband/mlx5_hw.h) | grep -v 'not owned' | head -1)
+ 
+ noinst_HEADERS = \
+ 	base/ib_device.h \

diff --git a/sys-cluster/ucx/ucx-1.13.1.ebuild b/sys-cluster/ucx/ucx-1.13.1.ebuild
index 382955d373c3..e3b3021121c9 100644
--- a/sys-cluster/ucx/ucx-1.13.1.ebuild
+++ b/sys-cluster/ucx/ucx-1.13.1.ebuild
@@ -28,6 +28,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.13.0-fix-fcntl-include-musl.patch
 	"${FILESDIR}"/${PN}-1.13.0-cstdint-include.patch
 	"${FILESDIR}"/${PN}-1.13.0-binutils-2.39-ptr-typedef.patch
+	"${FILESDIR}"/${PN}-1.13.0-no-rpm-sandbox.patch
 )
 
 pkg_pretend() {