pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

openmpi: Restore rpath patch



Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Sat Jul 30 10:15:36 2022 -0500
Changeset:	c77a6139149f45424abf43c89a6b82f896ebcb07

Modified Files:
	openmpi/distinfo
Added Files:
	openmpi/patches/patch-opal_tools_wrappers_opal__wrapper.c

Log Message:
openmpi: Restore rpath patch

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c77a6139149f45424abf43c89a6b82f896ebcb07

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 openmpi/distinfo                                   |  1 +
 .../patch-opal_tools_wrappers_opal__wrapper.c      | 32 ++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diffs:
diff --git a/openmpi/distinfo b/openmpi/distinfo
index 4ce3222420..791607a13d 100644
--- a/openmpi/distinfo
+++ b/openmpi/distinfo
@@ -10,3 +10,4 @@ SHA1 (patch-configure) = bb6373289ffa2beabccedb6ead679367c85dbe1e
 SHA1 (patch-ompi_mca_io_romio321_romio_configure) = 1adf4e3fff2ece5abba7c5909f006e8345917b9d
 SHA1 (patch-ompi_mca_sharedfp_sm_sharedfp__sm.c) = 7ce9147662864be5ae072166231d65189cb1bed2
 SHA1 (patch-ompi_mpi_java_java_Makefile.in) = bd61f02f56e03af9799d2ba86d66c1ded35f62f4
+SHA1 (patch-opal_tools_wrappers_opal__wrapper.c) = c21620ceab6aff220e6a4b74ce4929ff0d1c9885
diff --git a/openmpi/patches/patch-opal_tools_wrappers_opal__wrapper.c b/openmpi/patches/patch-opal_tools_wrappers_opal__wrapper.c
new file mode 100644
index 0000000000..d014682273
--- /dev/null
+++ b/openmpi/patches/patch-opal_tools_wrappers_opal__wrapper.c
@@ -0,0 +1,32 @@
+$NetBSD$
+
+# Add rpath support
+
+--- opal/tools/wrappers/opal_wrapper.c.orig	2022-07-30 14:00:47.068421047 +0000
++++ opal/tools/wrappers/opal_wrapper.c
+@@ -57,6 +57,7 @@
+ 
+ #define OPAL_INCLUDE_FLAG  "-I"
+ #define OPAL_LIBDIR_FLAG   "-L"
++#define OPAL_RPATH_FLAG    "-R"
+ 
+ struct options_data_t {
+     char **compiler_args;
+@@ -347,6 +348,8 @@ data_callback(const char *key, const cha
+                 char *line;
+                 asprintf(&line, OPAL_INCLUDE_FLAG"%s",
+                          options_data[parse_options_idx].path_opalincludedir);
++                asprintf(&line, OPAL_RPATH_FLAG"%s",
++                         options_data[parse_options_idx].path_libdir);
+                 opal_argv_append_nosize(&options_data[parse_options_idx].preproc_flags, line);
+                 free(line);
+             }
+@@ -358,6 +361,8 @@ data_callback(const char *key, const cha
+             char *line;
+             asprintf(&line, OPAL_LIBDIR_FLAG"%s",
+                      options_data[parse_options_idx].path_opallibdir);
++            asprintf(&line, OPAL_RPATH_FLAG"%s",
++                     options_data[parse_options_idx].path_libdir);
+             opal_argv_append_nosize(&options_data[parse_options_idx].link_flags, line);
+             free(line);
+         }


Home | Main Index | Thread Index | Old Index