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

Stéphane Gaudreault stephane at archlinux.org
Fri May 18 00:00:14 UTC 2012


    Date: Thursday, May 17, 2012 @ 20:00:13
  Author: stephane
Revision: 159205

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

Added:
  openmpi/repos/testing-i686/PKGBUILD
    (from rev 159204, openmpi/trunk/PKGBUILD)
  openmpi/repos/testing-i686/openmpi-hostfile.patch
    (from rev 159204, openmpi/trunk/openmpi-hostfile.patch)
  openmpi/repos/testing-x86_64/PKGBUILD
    (from rev 159204, openmpi/trunk/PKGBUILD)
  openmpi/repos/testing-x86_64/openmpi-hostfile.patch
    (from rev 159204, openmpi/trunk/openmpi-hostfile.patch)
Deleted:
  openmpi/repos/testing-i686/PKGBUILD
  openmpi/repos/testing-x86_64/PKGBUILD

---------------------------------------+
 testing-i686/PKGBUILD                 |  138 ++++++++++++++++----------------
 testing-i686/openmpi-hostfile.patch   |   12 ++
 testing-x86_64/PKGBUILD               |  138 ++++++++++++++++----------------
 testing-x86_64/openmpi-hostfile.patch |   12 ++
 4 files changed, 164 insertions(+), 136 deletions(-)

Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2012-05-18 00:00:03 UTC (rev 159204)
+++ testing-i686/PKGBUILD	2012-05-18 00:00:13 UTC (rev 159205)
@@ -1,68 +0,0 @@
-# $Id$
-# Maintainer: Stéphane Gaudreault <stephane at archlinux.org>
-pkgname=openmpi
-pkgver=1.6
-pkgrel=1
-pkgdesc="High performance message passing library (MPI)"
-arch=('i686' 'x86_64')
-url="http://www.open-mpi.org"
-license=('custom')
-depends=('gcc-fortran' 'openssh' 'valgrind' 'libltdl' 'hwloc')
-makedepends=('inetutils')
-options=(!libtool)
-source=(http://www.open-mpi.org/software/ompi/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('8b81eea712bb8f8120468003b5f29baecedf2367')
-
-build() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-
-   # Make sure we use the system ltdl librariry rather than the ones in the tarball
-   rm -r opal/libltdl
-
-   # Search for openmpi-default-hostfile in /etc/openmpi
-   sed -i "s|%s/etc/openmpi-default-hostfile|/etc/openmpi/openmpi-default-hostfile|" orte/runtime/orte_mca_params.c
-
-   ./configure --prefix=/usr \
-               --sysconfdir=/etc/${pkgname} \
-               --mandir=/usr/share/man \
-               --enable-mpi-f90 \
-               --libdir=/usr/lib/${pkgname} \
-               --with-threads=posix \
-               --enable-smp-locks \
-               --with-valgrind \
-               --enable-memchecker \
-               --enable-debug \
-               --enable-pretty-print-stacktrace \
-               --without-slurm \
-               --with-hwloc=/usr \
-               --with-libltdl=/usr  \
-               FC=/usr/bin/gfortran \
-               LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
-
-   make
-}
-
-package() {
-   cd "${srcdir}/${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}
-
-   # Openmpi's otfdump conflicts with the one from libotf
-   mv "${pkgdir}"/usr/bin/otfdump{,ompi}
-
-   # Remove dangling symlink
-   rm "${pkgdir}"/usr/share/man/man1/orteCC.1
-
-   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/PKGBUILD (from rev 159204, openmpi/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2012-05-18 00:00:13 UTC (rev 159205)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Stéphane Gaudreault <stephane at archlinux.org>
+pkgname=openmpi
+pkgver=1.6
+pkgrel=2
+pkgdesc="High performance message passing library (MPI)"
+arch=('i686' 'x86_64')
+url="http://www.open-mpi.org"
+license=('custom')
+depends=('gcc-fortran' 'openssh' 'valgrind' 'libltdl' 'hwloc')
+makedepends=('inetutils')
+options=(!libtool)
+source=(http://www.open-mpi.org/software/ompi/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2
+        openmpi-hostfile.patch)
+sha1sums=('8b81eea712bb8f8120468003b5f29baecedf2367'
+          'a76da03418a106d57cfd020d0f8d887d7ec9225b')
+
+build() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+
+   # Make sure we use the system ltdl librariry rather than the ones in the tarball
+   rm -r opal/libltdl
+
+   # Search for openmpi-default-hostfile in /etc/openmpi
+   patch -Np1 -i ../openmpi-hostfile.patch
+
+   ./configure --prefix=/usr \
+               --sysconfdir=/etc/${pkgname} \
+               --mandir=/usr/share/man \
+               --enable-mpi-f90 \
+               --libdir=/usr/lib/${pkgname} \
+               --with-threads=posix \
+               --enable-smp-locks \
+               --with-valgrind \
+               --enable-memchecker \
+               --enable-debug \
+               --enable-pretty-print-stacktrace \
+               --without-slurm \
+               --with-hwloc=/usr \
+               --with-libltdl=/usr  \
+               FC=/usr/bin/gfortran \
+               LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
+
+   make
+}
+
+package() {
+   cd "${srcdir}/${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}
+
+   # Openmpi's otfdump conflicts with the one from libotf
+   mv "${pkgdir}"/usr/bin/otfdump{,ompi}
+
+   # Remove dangling symlink
+   rm "${pkgdir}"/usr/share/man/man1/orteCC.1
+
+   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/openmpi-hostfile.patch (from rev 159204, openmpi/trunk/openmpi-hostfile.patch)
===================================================================
--- testing-i686/openmpi-hostfile.patch	                        (rev 0)
+++ testing-i686/openmpi-hostfile.patch	2012-05-18 00:00:13 UTC (rev 159205)
@@ -0,0 +1,12 @@
+diff -up openmpi-1.6/orte/runtime/orte_mca_params.c.hostfile openmpi-1.6/orte/runtime/orte_mca_params.c
+--- openmpi-1.6/orte/runtime/orte_mca_params.c.hostfile	2012-04-24 13:18:21.000000000 -0600
++++ openmpi-1.6/orte/runtime/orte_mca_params.c	2012-05-15 16:35:24.769565442 -0600
+@@ -225,7 +225,7 @@ int orte_register_params(void)
+                                 false, false, 1000, &orte_timeout_usec_per_proc);
+     
+     /* default hostfile */
+-    asprintf(&orte_default_hostfile, "%s/etc/openmpi-default-hostfile", opal_install_dirs.prefix);
++    asprintf(&orte_default_hostfile, "%s/openmpi-default-hostfile", opal_install_dirs.sysconfdir);
+     mca_base_param_reg_string_name("orte", "default_hostfile",
+                                    "Name of the default hostfile (relative or absolute path, \"none\" to ignore environmental or default MCA param setting)",
+                                    false, false, orte_default_hostfile, &orte_default_hostfile);

Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2012-05-18 00:00:03 UTC (rev 159204)
+++ testing-x86_64/PKGBUILD	2012-05-18 00:00:13 UTC (rev 159205)
@@ -1,68 +0,0 @@
-# $Id$
-# Maintainer: Stéphane Gaudreault <stephane at archlinux.org>
-pkgname=openmpi
-pkgver=1.6
-pkgrel=1
-pkgdesc="High performance message passing library (MPI)"
-arch=('i686' 'x86_64')
-url="http://www.open-mpi.org"
-license=('custom')
-depends=('gcc-fortran' 'openssh' 'valgrind' 'libltdl' 'hwloc')
-makedepends=('inetutils')
-options=(!libtool)
-source=(http://www.open-mpi.org/software/ompi/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('8b81eea712bb8f8120468003b5f29baecedf2367')
-
-build() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-
-   # Make sure we use the system ltdl librariry rather than the ones in the tarball
-   rm -r opal/libltdl
-
-   # Search for openmpi-default-hostfile in /etc/openmpi
-   sed -i "s|%s/etc/openmpi-default-hostfile|/etc/openmpi/openmpi-default-hostfile|" orte/runtime/orte_mca_params.c
-
-   ./configure --prefix=/usr \
-               --sysconfdir=/etc/${pkgname} \
-               --mandir=/usr/share/man \
-               --enable-mpi-f90 \
-               --libdir=/usr/lib/${pkgname} \
-               --with-threads=posix \
-               --enable-smp-locks \
-               --with-valgrind \
-               --enable-memchecker \
-               --enable-debug \
-               --enable-pretty-print-stacktrace \
-               --without-slurm \
-               --with-hwloc=/usr \
-               --with-libltdl=/usr  \
-               FC=/usr/bin/gfortran \
-               LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
-
-   make
-}
-
-package() {
-   cd "${srcdir}/${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}
-
-   # Openmpi's otfdump conflicts with the one from libotf
-   mv "${pkgdir}"/usr/bin/otfdump{,ompi}
-
-   # Remove dangling symlink
-   rm "${pkgdir}"/usr/share/man/man1/orteCC.1
-
-   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/PKGBUILD (from rev 159204, openmpi/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2012-05-18 00:00:13 UTC (rev 159205)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Stéphane Gaudreault <stephane at archlinux.org>
+pkgname=openmpi
+pkgver=1.6
+pkgrel=2
+pkgdesc="High performance message passing library (MPI)"
+arch=('i686' 'x86_64')
+url="http://www.open-mpi.org"
+license=('custom')
+depends=('gcc-fortran' 'openssh' 'valgrind' 'libltdl' 'hwloc')
+makedepends=('inetutils')
+options=(!libtool)
+source=(http://www.open-mpi.org/software/ompi/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2
+        openmpi-hostfile.patch)
+sha1sums=('8b81eea712bb8f8120468003b5f29baecedf2367'
+          'a76da03418a106d57cfd020d0f8d887d7ec9225b')
+
+build() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+
+   # Make sure we use the system ltdl librariry rather than the ones in the tarball
+   rm -r opal/libltdl
+
+   # Search for openmpi-default-hostfile in /etc/openmpi
+   patch -Np1 -i ../openmpi-hostfile.patch
+
+   ./configure --prefix=/usr \
+               --sysconfdir=/etc/${pkgname} \
+               --mandir=/usr/share/man \
+               --enable-mpi-f90 \
+               --libdir=/usr/lib/${pkgname} \
+               --with-threads=posix \
+               --enable-smp-locks \
+               --with-valgrind \
+               --enable-memchecker \
+               --enable-debug \
+               --enable-pretty-print-stacktrace \
+               --without-slurm \
+               --with-hwloc=/usr \
+               --with-libltdl=/usr  \
+               FC=/usr/bin/gfortran \
+               LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
+
+   make
+}
+
+package() {
+   cd "${srcdir}/${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}
+
+   # Openmpi's otfdump conflicts with the one from libotf
+   mv "${pkgdir}"/usr/bin/otfdump{,ompi}
+
+   # Remove dangling symlink
+   rm "${pkgdir}"/usr/share/man/man1/orteCC.1
+
+   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/openmpi-hostfile.patch (from rev 159204, openmpi/trunk/openmpi-hostfile.patch)
===================================================================
--- testing-x86_64/openmpi-hostfile.patch	                        (rev 0)
+++ testing-x86_64/openmpi-hostfile.patch	2012-05-18 00:00:13 UTC (rev 159205)
@@ -0,0 +1,12 @@
+diff -up openmpi-1.6/orte/runtime/orte_mca_params.c.hostfile openmpi-1.6/orte/runtime/orte_mca_params.c
+--- openmpi-1.6/orte/runtime/orte_mca_params.c.hostfile	2012-04-24 13:18:21.000000000 -0600
++++ openmpi-1.6/orte/runtime/orte_mca_params.c	2012-05-15 16:35:24.769565442 -0600
+@@ -225,7 +225,7 @@ int orte_register_params(void)
+                                 false, false, 1000, &orte_timeout_usec_per_proc);
+     
+     /* default hostfile */
+-    asprintf(&orte_default_hostfile, "%s/etc/openmpi-default-hostfile", opal_install_dirs.prefix);
++    asprintf(&orte_default_hostfile, "%s/openmpi-default-hostfile", opal_install_dirs.sysconfdir);
+     mca_base_param_reg_string_name("orte", "default_hostfile",
+                                    "Name of the default hostfile (relative or absolute path, \"none\" to ignore environmental or default MCA param setting)",
+                                    false, false, orte_default_hostfile, &orte_default_hostfile);




More information about the arch-commits mailing list