From edec45419def1b81bd663a2859684ef55ba56269 Mon Sep 17 00:00:00 2001 From: Parabola Date: Mon, 28 May 2012 20:14:47 +0000 Subject: Mon May 28 20:14:39 UTC 2012 --- testing/openmpi/PKGBUILD | 70 ---------------------- .../openmpi-1.5.4-fix-fakeroot-execution.patch | 43 ------------- testing/openmpi/openmpi-hostfile.patch | 12 ---- 3 files changed, 125 deletions(-) delete mode 100644 testing/openmpi/PKGBUILD delete mode 100644 testing/openmpi/openmpi-1.5.4-fix-fakeroot-execution.patch delete mode 100644 testing/openmpi/openmpi-hostfile.patch (limited to 'testing/openmpi') diff --git a/testing/openmpi/PKGBUILD b/testing/openmpi/PKGBUILD deleted file mode 100644 index b34de46b4..000000000 --- a/testing/openmpi/PKGBUILD +++ /dev/null @@ -1,70 +0,0 @@ -# $Id: PKGBUILD 159205 2012-05-18 00:00:13Z stephane $ -# Maintainer: Stéphane Gaudreault -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 -} diff --git a/testing/openmpi/openmpi-1.5.4-fix-fakeroot-execution.patch b/testing/openmpi/openmpi-1.5.4-fix-fakeroot-execution.patch deleted file mode 100644 index dc9dcfeae..000000000 --- a/testing/openmpi/openmpi-1.5.4-fix-fakeroot-execution.patch +++ /dev/null @@ -1,43 +0,0 @@ -Description: If running under Debian fakeroot then its important - that this hook is disabled; a new stat check was introduced in - 1.5.x which preceeds the FAKEROOT check resulting in a SEGFAULT. -Author: James Page -Origin: https://svn.open-mpi.org/trac/ompi/changeset/21489 - -Index: openmpi-1.5.4/opal/mca/memory/linux/hooks.c -=================================================================== ---- openmpi-1.5.4.orig/opal/mca/memory/linux/hooks.c 2012-02-15 12:59:39.986314651 +0000 -+++ openmpi-1.5.4/opal/mca/memory/linux/hooks.c 2012-02-15 13:14:57.744722517 +0000 -@@ -738,15 +738,6 @@ - check_result_t r1, r2, lp, lpp; - bool want_rcache = false, found_driver = false; - -- /* First, check if ummunotify is present on the system. If it is, -- then we don't need to do the following ptmalloc2 hacks. -- open/mmap on the device may fail during init, but if /dev/ummunotify -- exists, we assume that the user/administrator *wants* to use -- ummunotify. */ -- if (stat("/dev/ummunotify", &st) == 0) { -- return; -- } -- - /* Yes, checking for an MPI MCA parameter here is an abstraction - violation. Cope. Yes, even checking for *any* MCA parameter - here (without going through the MCA param API) is an -@@ -769,6 +760,15 @@ - return; - } - -+ /* Next, check if ummunotify is present on the system. If it is, -+ then we don't need to do the following ptmalloc2 hacks. -+ open/mmap on the device may fail during init, but if /dev/ummunotify -+ exists, we assume that the user/administrator *wants* to use -+ ummunotify. */ -+ if (stat("/dev/ummunotify", &st) == 0) { -+ return; -+ } -+ - /* Look for sentinel files (directories) to see if various network - drivers are loaded (yes, I know, further abstraction - violations...). - diff --git a/testing/openmpi/openmpi-hostfile.patch b/testing/openmpi/openmpi-hostfile.patch deleted file mode 100644 index f6377674b..000000000 --- a/testing/openmpi/openmpi-hostfile.patch +++ /dev/null @@ -1,12 +0,0 @@ -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); -- cgit v1.2.3-54-g00ecf