guru/sys-cluster/portals4/files/portals4-fix-PPE-related-compile-and-link-errors.patch
Alessandro Barbieri 191604ec08
sys-cluster/portals4: add upstream patch
Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
2021-08-09 02:31:55 +02:00

59 lines
1.6 KiB
Diff

From 3210ada117ddaa4591c5de7b2c86b86a3515f513 Mon Sep 17 00:00:00 2001
From: Todd Kordenbrock <thkgcode@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 */