Update to OpenMPI 1.5.5 rc2 rev. 25719.

This commit is contained in:
Aleksej Saushev 2012-01-19 20:13:14 +00:00 committed by Thomas Klausner
parent aa80bdc91e
commit 9b1e3399aa
6 changed files with 76 additions and 14 deletions

View file

@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.46 2012/01/13 00:00:56 asau Exp $
# $NetBSD: Makefile,v 1.47 2012/01/19 20:13:14 asau Exp $
DISTNAME= openmpi-1.5.1
DISTNAME= openmpi-1.5.5rc2r25705
PKGNAME= openmpi-1.5.4.25705
DISTNAME= openmpi-1.5.5rc2r25719
PKGNAME= openmpi-1.5.4.25719
CATEGORIES= parallel
MASTER_SITES= http://www.open-mpi.org/software/ompi/v1.5/downloads/ \
http://www.open-mpi.org/nightly/v1.5/
@ -28,6 +27,7 @@ SHLIBTOOL_OVERRIDE= ${WRKSRC}/config/libtool.m4 \
${WRKSRC}/opal/libltdl/m4/libtool.m4
CONFIGURE_ARGS+= --disable-mpi-f90
CONFIGURE_ARGS+= --without-slurm
CONFIGURE_ARGS+= --with-libltdl=external # use our libltdl
CONFIGURE_ARGS+= --with-wrapper-ldflags="-L${PREFIX}/lib ${LINKER_RPATH_FLAG}${PREFIX}/lib"
CONFIGURE_ENV+= ompi_cv_f77_have_INTEGERp8=no # no "INTEGER*8"??

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.15 2011/12/25 18:34:15 asau Exp $
@comment $NetBSD: PLIST,v 1.16 2012/01/19 20:13:14 asau Exp $
bin/mpiCC
bin/mpic++
bin/mpicc
@ -89,8 +89,6 @@ lib/openmpi/mca_coll_sm.la
lib/openmpi/mca_coll_sync.la
lib/openmpi/mca_coll_tuned.la
lib/openmpi/mca_crs_none.la
lib/openmpi/mca_debugger_mpir.la
lib/openmpi/mca_debugger_mpirx.la
lib/openmpi/mca_dpm_orte.la
lib/openmpi/mca_errmgr_default.la
lib/openmpi/mca_ess_env.la

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST.vt,v 1.5 2012/01/13 00:00:56 asau Exp $
@comment $NetBSD: PLIST.vt,v 1.6 2012/01/19 20:13:14 asau Exp $
bin/mpiCC-vt
bin/mpic++-vt
bin/mpicc-vt
@ -30,7 +30,6 @@ bin/vtrun
bin/vtunify
bin/vtunify-mpi
bin/vtwrapper
etc/vt-java-default-filter.spec
include/vampirtrace/OTFAUX_MsgMatching.h
include/vampirtrace/OTFAUX_Thumbnail.h
include/vampirtrace/OTF_CopyHandler_stream.h
@ -86,6 +85,9 @@ share/openmpi/mpif90-vt-wrapper-data.txt
share/vampirtrace/FILTER.SPEC
share/vampirtrace/GROUPS.SPEC
share/vampirtrace/METRICS.SPEC
share/vampirtrace/VampirTrace/examples/vt-java-default-filter.spec
share/vampirtrace/VampirTrace/examples/vt-setup-config.dtd
share/vampirtrace/VampirTrace/examples/vt-setup-config.xml
share/vampirtrace/doc/ChangeLog
share/vampirtrace/doc/LICENSE
share/vampirtrace/doc/UserManual.html

View file

@ -1,9 +1,10 @@
$NetBSD: distinfo,v 1.39 2012/01/13 00:00:56 asau Exp $
$NetBSD: distinfo,v 1.40 2012/01/19 20:13:14 asau Exp $
SHA1 (openmpi-1.5.5rc2r25705.tar.bz2) = 827fa01d41505b9f0ac8f0e1db6a1fe65ff28fa5
RMD160 (openmpi-1.5.5rc2r25705.tar.bz2) = d08ed1aa4c941b8aa4df0940b7ff06a481802e1a
Size (openmpi-1.5.5rc2r25705.tar.bz2) = 9962086 bytes
SHA1 (openmpi-1.5.5rc2r25719.tar.bz2) = 92d1346b8d8518b0e790916815cc6f8ab6cec3eb
RMD160 (openmpi-1.5.5rc2r25719.tar.bz2) = 7c359c1aee0eaccc49947cb0e43e4e67b622e5d7
Size (openmpi-1.5.5rc2r25719.tar.bz2) = 9918545 bytes
SHA1 (patch-aa) = 1c0b8dd74825e3dfa63913990bed588df8ab942a
SHA1 (patch-ai) = b7917cdf448106fc8f971c09b4c0646a7383511c
SHA1 (patch-aj) = dc85e6c9eb6db0eb40bb896a11c223afeda63c2f
SHA1 (patch-ak) = f6ea4220d51dd0c84ac2067d695c265f00904a0f
SHA1 (patch-ompi_contrib_vt_vt_etc_Makefile.in) = 618bf678c701a357efb21152d62d097cb7056492

View file

@ -1,4 +1,4 @@
# $NetBSD: options.mk,v 1.2 2010/04/01 01:47:28 asau Exp $
# $NetBSD: options.mk,v 1.3 2012/01/19 20:13:14 asau Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.openmpi
PKG_SUPPORTED_OPTIONS= debug openmpi-vampirtrace
@ -14,6 +14,14 @@ CONFIGURE_ARGS+= --enable-debug
.if !empty(PKG_OPTIONS:Mopenmpi-vampirtrace)
CONFLICTS+= libotf-[0-9]*
PLIST_SRC+= PLIST.vt
CONF_FILES+= share/vampirtrace/VampirTrace/examples/vt-java-default-filter.spec \
$(PKG_SYSCONFDIR)/vt-java-default-filter.spec
CONF_FILES+= share/vampirtrace/VampirTrace/examples/vt-setup-config.dtd \
$(PKG_SYSCONFDIR)/vt-setup-config.dtd
CONF_FILES+= share/vampirtrace/VampirTrace/examples/vt-setup-config.xml \
$(PKG_SYSCONFDIR)/vt-setup-config.xml
.include "../../graphics/freetype2/buildlink3.mk"
.else
CONFIGURE_ARGS+= --enable-contrib-no-build=vt

View file

@ -0,0 +1,53 @@
$NetBSD: patch-ompi_contrib_vt_vt_etc_Makefile.in,v 1.1 2012/01/19 20:13:14 asau Exp $
--- ompi/contrib/vt/vt/etc/Makefile.in.orig 2012-01-17 04:30:11.000000000 +0000
+++ ompi/contrib/vt/vt/etc/Makefile.in
@@ -458,6 +458,7 @@ vtsysconf_DATA = \
vt-setup-config.xml
vtsysconfdir = $(sysconfdir)
+vtsysconfexampledir = $(pkgdatadir)/examples
EXTRA_DIST = \
vt-java-default-filter.spec \
vt-setup-config.dtd
@@ -505,24 +506,24 @@ clean-libtool:
-rm -rf .libs _libs
install-vtsysconfDATA: $(vtsysconf_DATA)
@$(NORMAL_INSTALL)
- test -z "$(vtsysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(vtsysconfdir)"
- @list='$(vtsysconf_DATA)'; test -n "$(vtsysconfdir)" || list=; \
+ test -z "$(vtsysconfexampledir)" || $(MKDIR_P) "$(DESTDIR)$(vtsysconfexampledir)"
+ @list='$(vtsysconf_DATA)'; test -n "$(vtsysconfexampledir)" || list=; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(vtsysconfdir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(vtsysconfdir)" || exit $$?; \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(vtsysconfexampledir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(vtsysconfexampledir)" || exit $$?; \
done
uninstall-vtsysconfDATA:
@$(NORMAL_UNINSTALL)
- @list='$(vtsysconf_DATA)'; test -n "$(vtsysconfdir)" || list=; \
+ @list='$(vtsysconf_DATA)'; test -n "$(vtsysconfexampledir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(vtsysconfdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(vtsysconfdir)" && rm -f $$files
+ echo " ( cd '$(DESTDIR)$(vtsysconfexampledir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(vtsysconfexampledir)" && rm -f $$files
tags: TAGS
TAGS:
@@ -564,7 +565,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(vtsysconfdir)"; do \
+ for dir in "$(DESTDIR)$(vtsysconfexampledir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am