| 1 |
commit: 1cdce793e59c02894817d9bc1a383372ab43531e |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 9 14:33:52 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 9 14:34:06 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cdce793 |
| 7 |
|
| 8 |
sys-cluster/ucx: don't try to call rpm |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/790338 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-cluster/ucx/files/ucx-1.13.0-no-rpm-sandbox.patch | 12 ++++++++++++ |
| 14 |
sys-cluster/ucx/ucx-1.13.1.ebuild | 1 + |
| 15 |
2 files changed, 13 insertions(+) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..c387d640dff6 |
| 20 |
--- /dev/null |
| 21 |
+++ b/sys-cluster/ucx/files/ucx-1.13.0-no-rpm-sandbox.patch |
| 22 |
@@ -0,0 +1,12 @@ |
| 23 |
+https://bugs.gentoo.org/790338 |
| 24 |
+--- a/src/uct/ib/Makefile.am |
| 25 |
++++ b/src/uct/ib/Makefile.am |
| 26 |
+@@ -13,7 +13,7 @@ libuct_ib_la_CFLAGS = $(BASE_CFLAGS) |
| 27 |
+ libuct_ib_la_LIBADD = $(top_builddir)/src/ucs/libucs.la \ |
| 28 |
+ $(top_builddir)/src/uct/libuct.la |
| 29 |
+ libuct_ib_la_LDFLAGS = $(IBVERBS_LDFLAGS) $(NUMA_LIBS) -version-info $(SOVERSION) |
| 30 |
+-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) |
| 31 |
++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) |
| 32 |
+ |
| 33 |
+ noinst_HEADERS = \ |
| 34 |
+ base/ib_device.h \ |
| 35 |
|
| 36 |
diff --git a/sys-cluster/ucx/ucx-1.13.1.ebuild b/sys-cluster/ucx/ucx-1.13.1.ebuild |
| 37 |
index 382955d373c3..e3b3021121c9 100644 |
| 38 |
--- a/sys-cluster/ucx/ucx-1.13.1.ebuild |
| 39 |
+++ b/sys-cluster/ucx/ucx-1.13.1.ebuild |
| 40 |
@@ -28,6 +28,7 @@ PATCHES=( |
| 41 |
"${FILESDIR}"/${PN}-1.13.0-fix-fcntl-include-musl.patch |
| 42 |
"${FILESDIR}"/${PN}-1.13.0-cstdint-include.patch |
| 43 |
"${FILESDIR}"/${PN}-1.13.0-binutils-2.39-ptr-typedef.patch |
| 44 |
+ "${FILESDIR}"/${PN}-1.13.0-no-rpm-sandbox.patch |
| 45 |
) |
| 46 |
|
| 47 |
pkg_pretend() { |
Archives