Catch up.

This commit is contained in:
Aleksej Saushev 2011-12-25 18:34:15 +00:00 committed by Thomas Klausner
parent 5aa1056845
commit 0cf5366774
4 changed files with 24 additions and 18 deletions

View file

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.44 2011/08/01 17:39:32 asau Exp $
# $NetBSD: Makefile,v 1.45 2011/12/25 18:34:15 asau Exp $
DISTNAME= openmpi-1.5.1
DISTNAME= openmpi-1.5.4a1r24935
PKGNAME= openmpi-1.5.4.24935
DISTNAME= openmpi-1.5.5rc2r25683
PKGNAME= openmpi-1.5.4.25683
CATEGORIES= parallel
MASTER_SITES= http://www.open-mpi.org/software/ompi/v1.5/downloads/ \
http://www.open-mpi.org/nightly/v1.5/

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.14 2011/05/29 21:18:35 asau Exp $
@comment $NetBSD: PLIST,v 1.15 2011/12/25 18:34:15 asau Exp $
bin/mpiCC
bin/mpic++
bin/mpicc
@ -107,6 +107,7 @@ lib/openmpi/mca_iof_hnp.la
lib/openmpi/mca_iof_orted.la
lib/openmpi/mca_iof_tool.la
lib/openmpi/mca_maffinity_first_use.la
lib/openmpi/mca_maffinity_hwloc.la
lib/openmpi/mca_mpool_fake.la
lib/openmpi/mca_mpool_rdma.la
lib/openmpi/mca_mpool_sm.la
@ -142,6 +143,8 @@ lib/openmpi/mca_routed_direct.la
lib/openmpi/mca_routed_linear.la
lib/openmpi/mca_routed_radix.la
lib/openmpi/mca_routed_slave.la
lib/openmpi/mca_shmem_mmap.la
lib/openmpi/mca_shmem_sysv.la
lib/openmpi/mca_topo_unity.la
lib/openmpi/mca_vprotocol_pessimist.la
lib/pkgconfig/ompi-c.pc
@ -524,7 +527,10 @@ share/openmpi/help-oob-tcp.txt
share/openmpi/help-opal-carto-file.txt
share/openmpi/help-opal-crs-base.txt
share/openmpi/help-opal-crs-none.txt
share/openmpi/help-opal-maffinity-hwloc.txt
share/openmpi/help-opal-runtime.txt
share/openmpi/help-opal-shmem-mmap.txt
share/openmpi/help-opal-shmem-sysv.txt
share/openmpi/help-opal-util.txt
share/openmpi/help-opal-wrapper.txt
share/openmpi/help-orte-clean.txt

View file

@ -1,9 +1,9 @@
$NetBSD: distinfo,v 1.37 2011/08/01 17:39:32 asau Exp $
$NetBSD: distinfo,v 1.38 2011/12/25 18:34:15 asau Exp $
SHA1 (openmpi-1.5.4a1r24935.tar.bz2) = 0ff5aeb8e1cb1ba2958f3a811d8af8b04cd97b9d
RMD160 (openmpi-1.5.4a1r24935.tar.bz2) = 25753f7b017d54250a40f872fdc8f0c445fd6132
Size (openmpi-1.5.4a1r24935.tar.bz2) = 7630446 bytes
SHA1 (patch-aa) = 90f74e14eb686cd68bf29ea28cfb9818984f6408
SHA1 (openmpi-1.5.5rc2r25683.tar.bz2) = c38a3221abf2011d64e89830b820cd83ea6c0a16
RMD160 (openmpi-1.5.5rc2r25683.tar.bz2) = cf976a2bdb4a16e614394f881305450aed949dc7
Size (openmpi-1.5.5rc2r25683.tar.bz2) = 9959352 bytes
SHA1 (patch-aa) = 1c0b8dd74825e3dfa63913990bed588df8ab942a
SHA1 (patch-ai) = b7917cdf448106fc8f971c09b4c0646a7383511c
SHA1 (patch-aj) = dc85e6c9eb6db0eb40bb896a11c223afeda63c2f
SHA1 (patch-ak) = f6ea4220d51dd0c84ac2067d695c265f00904a0f

View file

@ -1,18 +1,18 @@
$NetBSD: patch-aa,v 1.2 2010/01/13 21:28:10 asau Exp $
$NetBSD: patch-aa,v 1.3 2011/12/25 18:34:15 asau Exp $
Missing RPATH support.
--- opal/tools/wrappers/opal_wrapper.c.orig 2009-11-04 17:57:36.000000000 +0300
+++ opal/tools/wrappers/opal_wrapper.c 2010-01-12 20:48:26.000000000 +0300
@@ -58,6 +58,7 @@
#if !defined(__WINDOWS__)
--- opal/tools/wrappers/opal_wrapper.c.orig 2011-12-23 06:47:51.000000000 +0400
+++ opal/tools/wrappers/opal_wrapper.c 2011-12-25 21:18:42.000000000 +0400
@@ -61,6 +61,7 @@
#else
#define OPAL_INCLUDE_FLAG "-I"
#define OPAL_LIBDIR_FLAG "-L"
+#define OPAL_RPATH_FLAG "-R"
#else
#define OPAL_INCLUDE_FLAG "/I"
#define OPAL_LIBDIR_FLAG "/LIBPATH:"
@@ -357,6 +358,8 @@
#endif /* !defined(__WINDOWS__) && defined(_MSC_VER) */
struct options_data_t {
@@ -363,6 +364,8 @@
#else
asprintf(&line, OPAL_LIBDIR_FLAG"%s",
options_data[parse_options_idx].path_libdir);