| 1 |
jsbronder 15/02/04 21:46:32 |
| 2 |
|
| 3 |
Added: openmpi-ltdl.patch |
| 4 |
Log: |
| 5 |
Use system libltdl #273108 |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4D7043C9) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sys-cluster/openmpi/files/openmpi-ltdl.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/openmpi/files/openmpi-ltdl.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/openmpi/files/openmpi-ltdl.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: openmpi-ltdl.patch |
| 16 |
=================================================================== |
| 17 |
diff -up openmpi-1.6.3/ompi/debuggers/dlopen_test.c.ltdl openmpi-1.6.3/ompi/debuggers/dlopen_test.c |
| 18 |
--- openmpi-1.6.3/ompi/debuggers/dlopen_test.c.ltdl 2012-04-03 08:30:25.000000000 -0600 |
| 19 |
+++ openmpi-1.6.3/ompi/debuggers/dlopen_test.c 2012-11-02 14:50:12.613702426 -0600 |
| 20 |
@@ -13,7 +13,17 @@ |
| 21 |
#include <string.h> |
| 22 |
#include <stdlib.h> |
| 23 |
|
| 24 |
-#include "opal/libltdl/ltdl.h" |
| 25 |
+#if OPAL_WANT_LIBLTDL |
| 26 |
+ #ifndef __WINDOWS__ |
| 27 |
+ #if OPAL_LIBLTDL_INTERNAL |
| 28 |
+ #include "opal/libltdl/ltdl.h" |
| 29 |
+ #else |
| 30 |
+ #include "ltdl.h" |
| 31 |
+ #endif |
| 32 |
+ #else |
| 33 |
+ #include "ltdl.h" |
| 34 |
+ #endif |
| 35 |
+#endif |
| 36 |
|
| 37 |
static int do_test(void); |
| 38 |
|
| 39 |
diff -up openmpi-1.6.3/ompi/debuggers/Makefile.am.ltdl openmpi-1.6.3/ompi/debuggers/Makefile.am |
| 40 |
--- openmpi-1.6.3/ompi/debuggers/Makefile.am.ltdl 2012-04-03 08:30:25.000000000 -0600 |
| 41 |
+++ openmpi-1.6.3/ompi/debuggers/Makefile.am 2012-11-02 15:04:53.636926260 -0600 |
| 42 |
@@ -47,7 +47,7 @@ headers = \ |
| 43 |
|
| 44 |
dlopen_test_SOURCES = dlopen_test.c |
| 45 |
dlopen_test_CPPFLAGS = -I$(top_srcdir)/opal/libltdl |
| 46 |
-dlopen_test_LDADD = $(top_builddir)/opal/libltdl/libltdlc.la |
| 47 |
+dlopen_test_LDADD = $(LIBLTDL) |
| 48 |
|
| 49 |
predefined_gap_test_SOURCES = predefined_gap_test.c |
| 50 |
predefined_gap_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS) |
| 51 |
diff -up openmpi-1.6.3/test/support/components.c.ltdl openmpi-1.6.3/test/support/components.c |
| 52 |
--- openmpi-1.6.3/test/support/components.c.ltdl 2012-04-03 08:29:44.000000000 -0600 |
| 53 |
+++ openmpi-1.6.3/test/support/components.c 2012-11-02 14:50:29.204705380 -0600 |
| 54 |
@@ -24,7 +24,17 @@ |
| 55 |
|
| 56 |
#include "opal/constants.h" |
| 57 |
#include "opal/mca/mca.h" |
| 58 |
-#include "opal/libltdl/ltdl.h" |
| 59 |
+#if OPAL_WANT_LIBLTDL |
| 60 |
+ #ifndef __WINDOWS__ |
| 61 |
+ #if OPAL_LIBLTDL_INTERNAL |
| 62 |
+ #include "opal/libltdl/ltdl.h" |
| 63 |
+ #else |
| 64 |
+ #include "ltdl.h" |
| 65 |
+ #endif |
| 66 |
+ #else |
| 67 |
+ #include "ltdl.h" |
| 68 |
+ #endif |
| 69 |
+#endif |
| 70 |
|
| 71 |
#include "components.h" |
| 72 |
|
| 73 |
diff -up openmpi-1.6.3/test/support/components.h.ltdl openmpi-1.6.3/test/support/components.h |
| 74 |
--- openmpi-1.6.3/test/support/components.h.ltdl 2012-04-03 08:29:44.000000000 -0600 |
| 75 |
+++ openmpi-1.6.3/test/support/components.h 2012-11-02 14:50:22.409703519 -0600 |
| 76 |
@@ -20,7 +20,17 @@ |
| 77 |
#ifndef OMPI_SUPPORT_COMPONENTS_H |
| 78 |
#define OMPI_SUPPORT_COMPONENTS_H |
| 79 |
|
| 80 |
-#include "opal/libltdl/ltdl.h" |
| 81 |
+#if OPAL_WANT_LIBLTDL |
| 82 |
+ #ifndef __WINDOWS__ |
| 83 |
+ #if OPAL_LIBLTDL_INTERNAL |
| 84 |
+ #include "opal/libltdl/ltdl.h" |
| 85 |
+ #else |
| 86 |
+ #include "ltdl.h" |
| 87 |
+ #endif |
| 88 |
+ #else |
| 89 |
+ #include "ltdl.h" |
| 90 |
+ #endif |
| 91 |
+#endif |
| 92 |
#include "opal/mca/mca.h" |
| 93 |
|
| 94 |
BEGIN_C_DECLS |
Archives