diff options
| author | Britney Fransen <brfransen@gmail.com> | 2015-02-19 18:16:16 (GMT) |
|---|---|---|
| committer | Britney Fransen <brfransen@gmail.com> | 2015-02-19 18:16:16 (GMT) |
| commit | 8de064f6e96f960cdbfe6868d9957a4613f704df (patch) | |
| tree | 4e73a420991733450d013529c0fee60e0365297a /abs/extra/openmpi/system_ltdl.patch | |
| parent | 0374b16f1e15ba1819b62bd5a6e0076ac7b243d0 (diff) | |
| parent | 6fde8cd5e74f0840e01988e743464fe91c0a28f8 (diff) | |
| download | linhes_pkgbuild-8de064f6e96f960cdbfe6868d9957a4613f704df.zip linhes_pkgbuild-8de064f6e96f960cdbfe6868d9957a4613f704df.tar.gz linhes_pkgbuild-8de064f6e96f960cdbfe6868d9957a4613f704df.tar.bz2 | |
Merge branch 'testing'
Diffstat (limited to 'abs/extra/openmpi/system_ltdl.patch')
| -rw-r--r-- | abs/extra/openmpi/system_ltdl.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/abs/extra/openmpi/system_ltdl.patch b/abs/extra/openmpi/system_ltdl.patch new file mode 100644 index 0000000..300da38 --- /dev/null +++ b/abs/extra/openmpi/system_ltdl.patch @@ -0,0 +1,66 @@ +diff --git a/config/ltdl.m4 b/config/ltdl.m4 +index ea76f4d..2f1cbfe 100644 +--- a/config/ltdl.m4 ++++ b/config/ltdl.m4 +@@ -162,6 +162,8 @@ m4_defun([_LTDL_INSTALLABLE], + fi + fi + ++enable_ltdl_install=no ++ + # If configure.ac declared an installable ltdl, and the user didn't override + # with --disable-ltdl-install, we will install the shipped libltdl. + case $enable_ltdl_install in +diff --git a/ompi/debuggers/Makefile.am b/ompi/debuggers/Makefile.am +index 2adf3fd..5b22a91 100644 +--- a/ompi/debuggers/Makefile.am ++++ b/ompi/debuggers/Makefile.am +@@ -46,8 +46,7 @@ headers = \ + # Simple checks to ensure that the DSOs are functional + + dlopen_test_SOURCES = dlopen_test.c +-dlopen_test_CPPFLAGS = -I$(top_srcdir)/opal/libltdl +-dlopen_test_LDADD = $(top_builddir)/opal/libltdl/libltdlc.la ++dlopen_test_LDADD = -lltdl + + predefined_gap_test_SOURCES = predefined_gap_test.c + predefined_gap_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS) +diff --git a/ompi/debuggers/dlopen_test.c b/ompi/debuggers/dlopen_test.c +index 029a4ee..023afb8 100644 +--- a/ompi/debuggers/dlopen_test.c ++++ b/ompi/debuggers/dlopen_test.c +@@ -13,7 +13,7 @@ + #include <string.h> + #include <stdlib.h> + +-#include "opal/libltdl/ltdl.h" ++#include "ltdl.h" + + static int do_test(void); + +diff --git a/test/support/components.c b/test/support/components.c +index 41c4345..6b4b464 100644 +--- a/test/support/components.c ++++ b/test/support/components.c +@@ -24,7 +24,7 @@ + + #include "opal/constants.h" + #include "opal/mca/mca.h" +-#include "opal/libltdl/ltdl.h" ++#include "ltdl.h" + + #include "components.h" + +diff --git a/test/support/components.h b/test/support/components.h +index 6db1f0d..fc8dfc5 100644 +--- a/test/support/components.h ++++ b/test/support/components.h +@@ -20,7 +20,7 @@ + #ifndef OMPI_SUPPORT_COMPONENTS_H + #define OMPI_SUPPORT_COMPONENTS_H + +-#include "opal/libltdl/ltdl.h" ++#include "ltdl.h" + #include "opal/mca/mca.h" + + BEGIN_C_DECLS |