From 1cdce793e59c02894817d9bc1a383372ab43531e Mon Sep 17 00:00:00 2001 From: Sam James Date: Fri, 9 Sep 2022 15:33:52 +0100 Subject: sys-cluster/ucx: don't try to call rpm Closes: https://bugs.gentoo.org/790338 Signed-off-by: Sam James --- 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(+) create mode 100644 sys-cluster/ucx/files/ucx-1.13.0-no-rpm-sandbox.patch 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() { -- cgit v1.2.3-65-gdbad