[arch-commits] Commit in openmpi/repos (8 files)

Levente Polyak anthraxx at archlinux.org
Wed Sep 13 17:23:41 UTC 2017


    Date: Wednesday, September 13, 2017 @ 17:23:40
  Author: anthraxx
Revision: 305424

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  openmpi/repos/extra-i686/PKGBUILD
    (from rev 305423, openmpi/trunk/PKGBUILD)
  openmpi/repos/extra-i686/system_ltdl.patch
    (from rev 305423, openmpi/trunk/system_ltdl.patch)
  openmpi/repos/extra-x86_64/PKGBUILD
    (from rev 305423, openmpi/trunk/PKGBUILD)
  openmpi/repos/extra-x86_64/system_ltdl.patch
    (from rev 305423, openmpi/trunk/system_ltdl.patch)
Deleted:
  openmpi/repos/extra-i686/PKGBUILD
  openmpi/repos/extra-i686/system_ltdl.patch
  openmpi/repos/extra-x86_64/PKGBUILD
  openmpi/repos/extra-x86_64/system_ltdl.patch

--------------------------------+
 /PKGBUILD                      |  124 ++++++++++++++++++++++++++++++++++++
 /system_ltdl.patch             |  132 +++++++++++++++++++++++++++++++++++++++
 extra-i686/PKGBUILD            |   63 ------------------
 extra-i686/system_ltdl.patch   |   66 -------------------
 extra-x86_64/PKGBUILD          |   63 ------------------
 extra-x86_64/system_ltdl.patch |   66 -------------------
 6 files changed, 256 insertions(+), 258 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2017-09-13 17:20:27 UTC (rev 305423)
+++ extra-i686/PKGBUILD	2017-09-13 17:23:40 UTC (rev 305424)
@@ -1,63 +0,0 @@
-# $Id$
-# Maintainer: Anatol Pomozov <anatol dot pomozov at gmail>
-# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
-
-pkgname=openmpi
-pkgver=2.1.1
-pkgrel=1
-pkgdesc='High performance message passing library (MPI)'
-arch=(i686 x86_64)
-url='http://www.open-mpi.org'
-license=(custom)
-depends=(libltdl hwloc)
-makedepends=(inetutils valgrind gcc-fortran)
-optdepends=('gcc-fortran: fortran support')
-options=(staticlibs)
-source=(http://www.open-mpi.org/software/ompi/v${pkgver%.*}/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('3aaee35c17b6ef02f4cee274f2670d5b7b2c968a')
-
-build() {
-   cd $pkgname-$pkgver
-
-   ./configure --prefix=/usr \
-               --sysconfdir=/etc/${pkgname} \
-               --enable-mpi-fortran=all \
-               --libdir=/usr/lib/${pkgname} \
-               --with-threads=posix \
-               --enable-mpi-thread-multiple \
-               --enable-smp-locks \
-               --enable-builtin-atomics \
-               --enable-mpi-cxx \
-               --with-valgrind \
-               --enable-memchecker \
-               --enable-pretty-print-stacktrace \
-               --without-slurm \
-               --with-hwloc=/usr \
-               --with-libltdl=/usr  \
-               FC=/usr/bin/gfortran \
-               LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
-
-   make
-}
-
-check() {
-   cd $pkgname-$pkgver
-
-   make check
-}
-
-package() {
-   cd $pkgname-$pkgver
-   make DESTDIR="$pkgdir" install
-
-   # FS#28583
-   install -d -m 755 "$pkgdir"/usr/lib/pkgconfig
-   for i in ompi-c.pc ompi-cxx.pc ompi-f77.pc ompi-f90.pc ompi.pc; do
-      ln -sf /usr/lib/openmpi/pkgconfig/$i "$pkgdir"/usr/lib/pkgconfig/
-   done
-
-   install -d -m 755 "$pkgdir"/etc/ld.so.conf.d
-   echo "/usr/lib/$pkgname" > "$pkgdir"/etc/ld.so.conf.d/$pkgname.conf
-
-   install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}

Copied: openmpi/repos/extra-i686/PKGBUILD (from rev 305423, openmpi/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2017-09-13 17:23:40 UTC (rev 305424)
@@ -0,0 +1,62 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Anatol Pomozov <anatol dot pomozov at gmail>
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+
+pkgname=openmpi
+pkgver=2.1.1
+pkgrel=2
+pkgdesc='High performance message passing library (MPI)'
+url='https://www.open-mpi.org'
+arch=('i686' 'x86_64')
+license=('custom:OpenMPI')
+depends=('libltdl' 'hwloc' 'openssh')
+makedepends=('inetutils' 'valgrind' 'gcc-fortran')
+optdepends=('gcc-fortran: fortran support')
+options=('staticlibs')
+source=(https://www.open-mpi.org/software/ompi/v${pkgver%.*}/downloads/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('bd7badd4ff3afa448c0d7f3ca0ee6ce003b957e9954aa87d8e4435759b5e4d16')
+sha512sums=('c11bba6ec815f9c8d32fce3578f8995f6cd694e02fb850d7e6cd3975989bb38fdbef348064264a1de418d0a21411c70ca74347ecff4f27eb5a2f6835019d6bca')
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc/${pkgname} \
+    --enable-mpi-fortran=all \
+    --libdir=/usr/lib/${pkgname} \
+    --with-threads=posix \
+    --enable-mpi-thread-multiple \
+    --enable-smp-locks \
+    --enable-builtin-atomics \
+    --enable-mpi-cxx \
+    --with-valgrind \
+    --enable-memchecker \
+    --enable-pretty-print-stacktrace \
+    --without-slurm \
+    --with-hwloc=/usr \
+    --with-libltdl=/usr  \
+    FC=/usr/bin/gfortran \
+    LDFLAGS="${LDFLAGS} -Wl,-z,noexecstack"
+  make
+}
+
+check() {
+  cd ${pkgname}-${pkgver}
+  make check
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+
+  # FS#28583
+  install -dm 755 "${pkgdir}/usr/lib/pkgconfig"
+  for i in ompi-c.pc ompi-cxx.pc ompi-f77.pc ompi-f90.pc ompi.pc; do
+    ln -sf "/usr/lib/openmpi/pkgconfig/${i}" "${pkgdir}/usr/lib/pkgconfig/"
+  done
+
+  install -dm 755 "${pkgdir}/etc/ld.so.conf.d"
+  echo "/usr/lib/${pkgname}" > "${pkgdir}"/etc/ld.so.conf.d/${pkgname}.conf
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}
+
+# vim: ts=2 sw=2 et:

Deleted: extra-i686/system_ltdl.patch
===================================================================
--- extra-i686/system_ltdl.patch	2017-09-13 17:20:27 UTC (rev 305423)
+++ extra-i686/system_ltdl.patch	2017-09-13 17:23:40 UTC (rev 305424)
@@ -1,66 +0,0 @@
-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

Copied: openmpi/repos/extra-i686/system_ltdl.patch (from rev 305423, openmpi/trunk/system_ltdl.patch)
===================================================================
--- extra-i686/system_ltdl.patch	                        (rev 0)
+++ extra-i686/system_ltdl.patch	2017-09-13 17:23:40 UTC (rev 305424)
@@ -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

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2017-09-13 17:20:27 UTC (rev 305423)
+++ extra-x86_64/PKGBUILD	2017-09-13 17:23:40 UTC (rev 305424)
@@ -1,63 +0,0 @@
-# $Id$
-# Maintainer: Anatol Pomozov <anatol dot pomozov at gmail>
-# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
-
-pkgname=openmpi
-pkgver=2.1.1
-pkgrel=1
-pkgdesc='High performance message passing library (MPI)'
-arch=(i686 x86_64)
-url='http://www.open-mpi.org'
-license=(custom)
-depends=(libltdl hwloc)
-makedepends=(inetutils valgrind gcc-fortran)
-optdepends=('gcc-fortran: fortran support')
-options=(staticlibs)
-source=(http://www.open-mpi.org/software/ompi/v${pkgver%.*}/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('3aaee35c17b6ef02f4cee274f2670d5b7b2c968a')
-
-build() {
-   cd $pkgname-$pkgver
-
-   ./configure --prefix=/usr \
-               --sysconfdir=/etc/${pkgname} \
-               --enable-mpi-fortran=all \
-               --libdir=/usr/lib/${pkgname} \
-               --with-threads=posix \
-               --enable-mpi-thread-multiple \
-               --enable-smp-locks \
-               --enable-builtin-atomics \
-               --enable-mpi-cxx \
-               --with-valgrind \
-               --enable-memchecker \
-               --enable-pretty-print-stacktrace \
-               --without-slurm \
-               --with-hwloc=/usr \
-               --with-libltdl=/usr  \
-               FC=/usr/bin/gfortran \
-               LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
-
-   make
-}
-
-check() {
-   cd $pkgname-$pkgver
-
-   make check
-}
-
-package() {
-   cd $pkgname-$pkgver
-   make DESTDIR="$pkgdir" install
-
-   # FS#28583
-   install -d -m 755 "$pkgdir"/usr/lib/pkgconfig
-   for i in ompi-c.pc ompi-cxx.pc ompi-f77.pc ompi-f90.pc ompi.pc; do
-      ln -sf /usr/lib/openmpi/pkgconfig/$i "$pkgdir"/usr/lib/pkgconfig/
-   done
-
-   install -d -m 755 "$pkgdir"/etc/ld.so.conf.d
-   echo "/usr/lib/$pkgname" > "$pkgdir"/etc/ld.so.conf.d/$pkgname.conf
-
-   install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}

Copied: openmpi/repos/extra-x86_64/PKGBUILD (from rev 305423, openmpi/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2017-09-13 17:23:40 UTC (rev 305424)
@@ -0,0 +1,62 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Anatol Pomozov <anatol dot pomozov at gmail>
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+
+pkgname=openmpi
+pkgver=2.1.1
+pkgrel=2
+pkgdesc='High performance message passing library (MPI)'
+url='https://www.open-mpi.org'
+arch=('i686' 'x86_64')
+license=('custom:OpenMPI')
+depends=('libltdl' 'hwloc' 'openssh')
+makedepends=('inetutils' 'valgrind' 'gcc-fortran')
+optdepends=('gcc-fortran: fortran support')
+options=('staticlibs')
+source=(https://www.open-mpi.org/software/ompi/v${pkgver%.*}/downloads/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('bd7badd4ff3afa448c0d7f3ca0ee6ce003b957e9954aa87d8e4435759b5e4d16')
+sha512sums=('c11bba6ec815f9c8d32fce3578f8995f6cd694e02fb850d7e6cd3975989bb38fdbef348064264a1de418d0a21411c70ca74347ecff4f27eb5a2f6835019d6bca')
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc/${pkgname} \
+    --enable-mpi-fortran=all \
+    --libdir=/usr/lib/${pkgname} \
+    --with-threads=posix \
+    --enable-mpi-thread-multiple \
+    --enable-smp-locks \
+    --enable-builtin-atomics \
+    --enable-mpi-cxx \
+    --with-valgrind \
+    --enable-memchecker \
+    --enable-pretty-print-stacktrace \
+    --without-slurm \
+    --with-hwloc=/usr \
+    --with-libltdl=/usr  \
+    FC=/usr/bin/gfortran \
+    LDFLAGS="${LDFLAGS} -Wl,-z,noexecstack"
+  make
+}
+
+check() {
+  cd ${pkgname}-${pkgver}
+  make check
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+
+  # FS#28583
+  install -dm 755 "${pkgdir}/usr/lib/pkgconfig"
+  for i in ompi-c.pc ompi-cxx.pc ompi-f77.pc ompi-f90.pc ompi.pc; do
+    ln -sf "/usr/lib/openmpi/pkgconfig/${i}" "${pkgdir}/usr/lib/pkgconfig/"
+  done
+
+  install -dm 755 "${pkgdir}/etc/ld.so.conf.d"
+  echo "/usr/lib/${pkgname}" > "${pkgdir}"/etc/ld.so.conf.d/${pkgname}.conf
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}
+
+# vim: ts=2 sw=2 et:

Deleted: extra-x86_64/system_ltdl.patch
===================================================================
--- extra-x86_64/system_ltdl.patch	2017-09-13 17:20:27 UTC (rev 305423)
+++ extra-x86_64/system_ltdl.patch	2017-09-13 17:23:40 UTC (rev 305424)
@@ -1,66 +0,0 @@
-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

Copied: openmpi/repos/extra-x86_64/system_ltdl.patch (from rev 305423, openmpi/trunk/system_ltdl.patch)
===================================================================
--- extra-x86_64/system_ltdl.patch	                        (rev 0)
+++ extra-x86_64/system_ltdl.patch	2017-09-13 17:23:40 UTC (rev 305424)
@@ -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



More information about the arch-commits mailing list