[arch-commits] Commit in openmpi/trunk (PKGBUILD)

[Stéphane Gaudreault]

    Date: Monday, April 30, 2012 @ 17:39:54
  Author: stephane
Revision: 157995

upgpkg: openmpi 1.5.5-3

Depend on libltdl rather than libtool

Modified:
  openmpi/trunk/PKGBUILD

----------+
 PKGBUILD |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-30 20:56:00 UTC (rev 157994)
+++ PKGBUILD	2012-04-30 21:39:54 UTC (rev 157995)
@@ -2,12 +2,12 @@
 # Maintainer: Stéphane Gaudreault <stephane at archlinux.org>
 pkgname=openmpi
 pkgver=1.5.5
-pkgrel=2
+pkgrel=3
 pkgdesc="High performance message passing library (MPI)"
 arch=('i686' 'x86_64')
 url="http://www.open-mpi.org"
 license=('custom')
-depends=('gcc' 'gcc-fortran' 'openssh' 'valgrind' 'libtool' 'hwloc')
+depends=('gcc-fortran' 'openssh' 'valgrind' 'libltdl' 'hwloc')
 makedepends=('inetutils')
 options=(!libtool)
 source=(http://www.open-mpi.org/software/ompi/v1.5/downloads/${pkgname}-${pkgver}.tar.bz2
@@ -20,6 +20,9 @@
 
    # Fix fakeroot problem (FS#28644)
    patch -Np1 -i ../openmpi-1.5.4-fix-fakeroot-execution.patch
+   
+   # Make sure we use the system ltdl librariry rather than the ones in the tarball
+   rm -r opal/libltdl
 
    ./configure --prefix=/usr \
                --sysconfdir=/etc/${pkgname} \
@@ -34,7 +37,7 @@
                --enable-pretty-print-stacktrace \
                --without-slurm \
                --with-hwloc=/usr \
-               --with-libltdl=/usr \
+               --with-libltdl=/usr  \
                FC=/usr/bin/gfortran \
                LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
 
@@ -48,7 +51,7 @@
    # 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/
+      ln -sf /usr/lib/openmpi/pkgconfig/${i} "${pkgdir}"/usr/lib/pkgconfig/
    done
 
    # Openmpi's otfinfo conflicts with the one from texlive