Date: Wed, 24 Sep 2014 11:55:14 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369170 - head/net/mpich2 Message-ID: <201409241155.s8OBtEik039054@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Wed Sep 24 11:55:13 2014 New Revision: 369170 URL: http://svnweb.freebsd.org/changeset/ports/369170 QAT: https://qat.redports.org/buildarchive/r369170/ Log: net/mpich2: fix pkg-plist when JAVA option disabled, but while here... When the default JAVA option is turned off, the check-plist fails due to four files that don't get installed, so prefix them with %%JAVA%% While here: * Fixing stage-qa with INSTALL_TARGET=install-strip * Manually strip JAVA option library libTraceInput.so as needed * Remove obsolete @dirrm * Add CFLAGS related to using ports execinfo to find the execinfo.h (ports GCC seem to look in /usr/local/include by default, but DF's base compiler does not, so explicitly specify this location) All of these should be covered under the "Just Fix It" blanket Modified: head/net/mpich2/Makefile head/net/mpich2/pkg-plist Modified: head/net/mpich2/Makefile ============================================================================== --- head/net/mpich2/Makefile Wed Sep 24 11:52:18 2014 (r369169) +++ head/net/mpich2/Makefile Wed Sep 24 11:55:13 2014 (r369170) @@ -3,7 +3,7 @@ PORTNAME= mpich2 DISTVERSION= 1.5 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 5 CATEGORIES= net java parallel MASTER_SITES= http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${DISTVERSION}/ @@ -26,6 +26,7 @@ USES= libtool:keepla fortran perl5 pkgc USE_GCC= yes USE_LDCONFIG= yes USE_PERL5= build +INSTALL_TARGET= install-strip OPTIONS_DEFINE_i386= JAVA OPTIONS_DEFINE_amd64= JAVA @@ -41,9 +42,11 @@ CONFIGURE_ARGS= --enable-romio --enable- --docdir="${DOCSDIR}" \ --with-python="${PYTHON_CMD}" CONFIGURE_ENV= FCFLAGS="${FFLAGS}" \ + MPI_CFLAGS="${LOCALBASE}/include" \ PACKAGE=${PORTNAME} \ PTHREAD_LIBS="${PTHREAD_LIBS}" +CFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include .if ${FFLAGS} == "-O" FFLAGS= -O2 @@ -173,6 +176,9 @@ post-install: .for pg in ${BIN2STRIP} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${pg} .endfor +.if ${PORT_OPTIONS:MJAVA} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/trace_rlog/libTraceInput.so +.endif .if defined(MAINTAINER_MODE) regression-test: install Modified: head/net/mpich2/pkg-plist ============================================================================== --- head/net/mpich2/pkg-plist Wed Sep 24 11:52:18 2014 (r369169) +++ head/net/mpich2/pkg-plist Wed Sep 24 11:55:13 2014 (r369170) @@ -880,9 +880,9 @@ sbin/mpeuninstall %%DATADIR%%/examples/graphics/cpi.c %%DATADIR%%/examples/graphics/cxgraphics.c %%DATADIR%%/examples/graphics/fxgraphics.f -%%DATADIR%%/examples/logfiles/barrier.rlog -%%DATADIR%%/examples/logfiles/fpilog.clog -%%DATADIR%%/examples/logfiles/fpilog.slog2 +%%JAVA%%%%DATADIR%%/examples/logfiles/barrier.rlog +%%JAVA%%%%DATADIR%%/examples/logfiles/fpilog.clog +%%JAVA%%%%DATADIR%%/examples/logfiles/fpilog.slog2 %%DATADIR%%/examples/logging/Makefile %%DATADIR%%/examples/logging/comm1_isr.c %%DATADIR%%/examples/logging/comm1_isr_loop.c @@ -903,15 +903,3 @@ sbin/mpeuninstall %%DATADIR%%/examples/logging/pthread_sendrecv.c %%DATADIR%%/examples/logging/pthread_sendrecv_user.c %%DATADIR%%/examples/logging/srtest.c -@dirrm %%DATADIR%%/examples/logfiles -@dirrm %%DATADIR%%/examples/logging -@dirrm %%DATADIR%%/examples/graphics -@dirrm %%DATADIR%%/examples/collchk -@dirrm %%DATADIR%%/examples -@dirrm %%DATADIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%%/www4 -%%JAVA%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/jumpshot-4/html -%%JAVA%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/jumpshot-4 -%%PORTDOCS%%@dirrm %%DOCSDIR%% -%%JAVA%%@dirrm lib/trace_rlog -@dirrm include/primitives
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409241155.s8OBtEik039054>