commit: 191604ec08bfc3159aaa3fea74c89eb022b4fb3e
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Mon Aug 9 00:29:58 2021 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Mon Aug 9 00:31:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=191604ec
sys-cluster/portals4: add upstream patch
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
...4-fix-PPE-related-compile-and-link-errors.patch | 58 ++++++++++++++++++++++
...ild => portals4-1.0_alpha1_p20190109-r2.ebuild} | 1 +
2 files changed, 59 insertions(+)
diff --git
a/sys-cluster/portals4/files/portals4-fix-PPE-related-compile-and-link-errors.patch
b/sys-cluster/portals4/files/portals4-fix-PPE-related-compile-and-link-errors.patch
new file mode 100644
index 000000000..a666ccb2c
--- /dev/null
+++
b/sys-cluster/portals4/files/portals4-fix-PPE-related-compile-and-link-errors.patch
@@ -0,0 +1,58 @@
+From 3210ada117ddaa4591c5de7b2c86b86a3515f513 Mon Sep 17 00:00:00 2001
+From: Todd Kordenbrock <thkgc...@gmail.com>
+Date: Sun, 8 Aug 2021 12:49:18 -0500
+Subject: [PATCH] Fix PPE related compile and link errors.
+
+---
+ src/ib/Makefile.am | 10 ++++++----
+ src/ib/ptl_mr.c | 5 ++++-
+ 2 files changed, 10 insertions(+), 5 deletions(-)
+
+--- a/src/ib/Makefile.am
++++ b/src/ib/Makefile.am
+@@ -97,9 +97,9 @@ endif
+ else
+ # PPE - (implies no SHMEM; IB optional)
+
+-libportals_ib_la_CPPFLAGS = -DIS_LIGHT_LIB -I$(top_srcdir)/include
$(XPMEM_CPPFLAGS)
+-libportals_ib_la_LIBADD = $(XPMEM_LIBS)
+-libportals_ib_la_LDFLAGS = $(XPMEM_LDFLAGS)
++libportals_ib_la_CPPFLAGS = -DIS_LIGHT_LIB -I$(top_srcdir)/include
$(ev_CPPFLAGS) $(XPMEM_CPPFLAGS)
++libportals_ib_la_LIBADD = $(ev_LIBS) $(XPMEM_LIBS)
++libportals_ib_la_LDFLAGS = $(ev_LDFLAGS) $(XPMEM_LDFLAGS)
+ libportals_ib_la_SOURCES = \
+ ptl_ct_common.c \
+ ptl_ct_common.h \
+@@ -205,7 +205,9 @@ endif
+ if WITH_TRANSPORT_UDP
+ libportals_ppe_la_SOURCES += \
+ ptl_iface_udp.c \
+- ptl_udp.c
++ ptl_udp.c \
++ ptl_rudp.h \
++ ptl_rudp.c
+ endif
+
+ endif
+--- a/src/ib/ptl_mr.c
++++ b/src/ib/ptl_mr.c
+@@ -335,6 +335,7 @@ int mr_lookup(ni_t *ni, struct ni_mr_tree *tree, void
*start,
+
+ mr = NULL;
+
++#if !IS_PPE
+ if (global_umn_init == 1){
+
+ while (link) {
+@@ -407,8 +408,10 @@ int mr_lookup(ni_t *ni, struct ni_mr_tree *tree, void
*start,
+ mr = NULL;
+ }
+ }
++ else
++#endif
+ /* No memory registration cache enabled */
+- else {
++ {
+ INIT_LIST_HEAD(&mr_list);
+ }
+ /* Insert the new node */
diff --git a/sys-cluster/portals4/portals4-1.0_alpha1_p20190109-r1.ebuild
b/sys-cluster/portals4/portals4-1.0_alpha1_p20190109-r2.ebuild
similarity index 96%
rename from sys-cluster/portals4/portals4-1.0_alpha1_p20190109-r1.ebuild
rename to sys-cluster/portals4/portals4-1.0_alpha1_p20190109-r2.ebuild
index 2498d1772..3afc7b43e 100644
--- a/sys-cluster/portals4/portals4-1.0_alpha1_p20190109-r1.ebuild
+++ b/sys-cluster/portals4/portals4-1.0_alpha1_p20190109-r2.ebuild
@@ -34,6 +34,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/${PN}-fix-PPE-related-compile-and-link-errors.patch" )
RESTRICT="!test? ( test )"
REQUIRED_USE="
?? ( ppe transport-shmem )
