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

Anatol Pomozov anatolik at archlinux.org
Sun Dec 21 02:10:14 UTC 2014


    Date: Sunday, December 21, 2014 @ 03:10:14
  Author: anatolik
Revision: 227850

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

Added:
  openmpi/repos/testing-i686/
  openmpi/repos/testing-i686/PKGBUILD
    (from rev 227849, openmpi/trunk/PKGBUILD)
  openmpi/repos/testing-i686/system_ltdl.patch
    (from rev 227849, openmpi/trunk/system_ltdl.patch)
  openmpi/repos/testing-x86_64/
  openmpi/repos/testing-x86_64/PKGBUILD
    (from rev 227849, openmpi/trunk/PKGBUILD)
  openmpi/repos/testing-x86_64/system_ltdl.patch
    (from rev 227849, openmpi/trunk/system_ltdl.patch)

----------------------------------+
 testing-i686/PKGBUILD            |   77 +++++++++++++++++++++++++++++++++++++
 testing-i686/system_ltdl.patch   |   66 +++++++++++++++++++++++++++++++
 testing-x86_64/PKGBUILD          |   77 +++++++++++++++++++++++++++++++++++++
 testing-x86_64/system_ltdl.patch |   66 +++++++++++++++++++++++++++++++
 4 files changed, 286 insertions(+)

Copied: openmpi/repos/testing-i686/PKGBUILD (from rev 227849, openmpi/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2014-12-21 02:10:14 UTC (rev 227850)
@@ -0,0 +1,77 @@
+# $Id$
+# Maintainer: Anatol Pomozov <anatol dot pomozov at gmail>
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+
+pkgname=openmpi
+pkgver=1.8.4
+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/v1.8/downloads/${pkgname}-${pkgver}.tar.bz2
+        system_ltdl.patch)
+sha1sums=('88ae39850fcf0db05ac20e35dd9e4cacc75bde4d'
+          'd5f8a3d463f1a1f29ca4725d6fb3b9f8c40799dc')
+
+prepare() {
+   cd $pkgname-$pkgver
+
+   # Make sure we use the system ltdl library rather than the ones in the tarball
+   rm -r opal/libltdl
+   patch -p1 < ../system_ltdl.patch
+   ./autogen.pl
+}
+
+build() {
+   cd $pkgname-$pkgver
+
+   ./configure --prefix=/usr \
+               --sysconfdir=/etc/${pkgname} \
+               --enable-mpi-fortran=all \
+               --libdir=/usr/lib/${pkgname} \
+               --with-threads=posix \
+               --enable-smp-locks \
+               --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
+
+   # Openmpi's otfinfo conflicts with the one from texlive
+   mv "$pkgdir"/usr/bin/otfinfo{,mpi}
+
+   # Remove dangling symlink and useless file
+   rm "$pkgdir"/usr/share/vampirtrace/config.log
+
+   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/testing-i686/system_ltdl.patch (from rev 227849, openmpi/trunk/system_ltdl.patch)
===================================================================
--- testing-i686/system_ltdl.patch	                        (rev 0)
+++ testing-i686/system_ltdl.patch	2014-12-21 02:10:14 UTC (rev 227850)
@@ -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

Copied: openmpi/repos/testing-x86_64/PKGBUILD (from rev 227849, openmpi/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2014-12-21 02:10:14 UTC (rev 227850)
@@ -0,0 +1,77 @@
+# $Id$
+# Maintainer: Anatol Pomozov <anatol dot pomozov at gmail>
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+
+pkgname=openmpi
+pkgver=1.8.4
+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/v1.8/downloads/${pkgname}-${pkgver}.tar.bz2
+        system_ltdl.patch)
+sha1sums=('88ae39850fcf0db05ac20e35dd9e4cacc75bde4d'
+          'd5f8a3d463f1a1f29ca4725d6fb3b9f8c40799dc')
+
+prepare() {
+   cd $pkgname-$pkgver
+
+   # Make sure we use the system ltdl library rather than the ones in the tarball
+   rm -r opal/libltdl
+   patch -p1 < ../system_ltdl.patch
+   ./autogen.pl
+}
+
+build() {
+   cd $pkgname-$pkgver
+
+   ./configure --prefix=/usr \
+               --sysconfdir=/etc/${pkgname} \
+               --enable-mpi-fortran=all \
+               --libdir=/usr/lib/${pkgname} \
+               --with-threads=posix \
+               --enable-smp-locks \
+               --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
+
+   # Openmpi's otfinfo conflicts with the one from texlive
+   mv "$pkgdir"/usr/bin/otfinfo{,mpi}
+
+   # Remove dangling symlink and useless file
+   rm "$pkgdir"/usr/share/vampirtrace/config.log
+
+   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/testing-x86_64/system_ltdl.patch (from rev 227849, openmpi/trunk/system_ltdl.patch)
===================================================================
--- testing-x86_64/system_ltdl.patch	                        (rev 0)
+++ testing-x86_64/system_ltdl.patch	2014-12-21 02:10:14 UTC (rev 227850)
@@ -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