From owner-svn-ports-all@FreeBSD.ORG Tue Jul 8 16:44:58 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ABA88F8B; Tue, 8 Jul 2014 16:44:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9853927C5; Tue, 8 Jul 2014 16:44:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s68Giw3B070406; Tue, 8 Jul 2014 16:44:58 GMT (envelope-from bf@svn.freebsd.org) Received: (from bf@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s68GiwaS070405; Tue, 8 Jul 2014 16:44:58 GMT (envelope-from bf@svn.freebsd.org) Message-Id: <201407081644.s68GiwaS070405@svn.freebsd.org> From: Brendan Fabeny Date: Tue, 8 Jul 2014 16:44:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361270 - head/math/kktdirect X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jul 2014 16:44:58 -0000 Author: bf Date: Tue Jul 8 16:44:58 2014 New Revision: 361270 URL: http://svnweb.freebsd.org/changeset/ports/361270 QAT: https://qat.redports.org/buildarchive/r361270/ Log: Use staging Modified: head/math/kktdirect/Makefile Modified: head/math/kktdirect/Makefile ============================================================================== --- head/math/kktdirect/Makefile Tue Jul 8 16:36:50 2014 (r361269) +++ head/math/kktdirect/Makefile Tue Jul 8 16:44:58 2014 (r361270) @@ -14,14 +14,11 @@ COMMENT= Direct solver package for saddl USES= fortran USE_LDCONFIG= yes -MAKE_JOBS_UNSAFE=yes - CFLAGS+= -DUSE_FORTRAN_BLAS -DUSE_FORTRAN_LAPACK LDFLAGS+= -L${LOCALBASE}/lib ${LAPACK} ${BLAS} -lm PLIST_FILES= include/kktdirect.h lib/libkktdirect.a lib/libkktdirect_pic.a \ lib/libkktdirect.so lib/libkktdirect.so.0 -NO_STAGE= yes .include .if ${ARCH} == "sparc64" @@ -39,27 +36,22 @@ WITH_BLAS?= reference .endif .if ${WITH_BLAS} == reference -LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas -LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack +LIB_DEPENDS+= libblas.so:${PORTSDIR}/math/blas +LIB_DEPENDS+= liblapack.so:${PORTSDIR}/math/lapack BLAS= -lblas LAPACK = -llapack .elif ${WITH_BLAS} == gotoblas -LIB_DEPENDS+= goto2:${PORTSDIR}/math/gotoblas +LIB_DEPENDS+= libgoto2p.so:${PORTSDIR}/math/gotoblas BLAS = -lgoto2p LAPACK = -lgoto2p .elif ${WITH_BLAS} == atlas -LIB_DEPENDS+= atlas:${PORTSDIR}/math/atlas +LIB_DEPENDS+= libatlas.so:${PORTSDIR}/math/atlas BLAS= -lptf77blas LAPACK = -lalapack -lptcblas .endif -.ifndef(NOPORTDOCS) PORTDOCS= kktdirect.pdf -.endif - -.ifndef(NOPORTEXAMPLES) PORTEXAMPLES= kktsolve.cpp -.endif post-patch: @${REINPLACE_CMD} -E \ @@ -70,40 +62,34 @@ post-patch: -e 's@ranlib@${RANLIB}@' \ ${WRKSRC}/Makefile -do-build: build-dynamic build-static +pre-build: + ${CP} -a ${WRKSRC} ${WRKSRC}_shared -.ORDER: build-dynamic build-static - -build-dynamic: patch - @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \ - ${MAKE_ARGS} PICFLAG="${PICFLAG}" clean libkktdirect.a ; \ - ${CXX} ${CXXFLAGS} -shared -Wl,-x -Wl,-soname,libkktdirect.so.0 \ +do-build: + @cd ${WRKSRC}_shared; ${DO_MAKE_BUILD} PICFLAG="${PICFLAG}" libkktdirect.a; \ + ${CXX} ${CXXFLAGS} -shared -Wl,-soname,libkktdirect.so.0 \ -o ${WRKDIR}/libkktdirect.so.0 -Wl,--whole-archive libkktdirect.a \ - -Wl,--no-whole-archive -Wl,--as-needed ${LDFLAGS} ; \ + -Wl,--no-whole-archive -Wl,--as-needed ${LDFLAGS}; \ ${CP} -af libkktdirect.a ${WRKDIR}/libkktdirect_pic.a - -build-static: patch - @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \ - ${MAKE_ARGS} PICFLAG="" clean libkktdirect.a ; \ + @cd ${WRKSRC}; ${DO_MAKE_BUILD} PICFLAG="" libkktdirect.a; \ ${CP} -af libkktdirect.a ${WRKDIR} check regression-test test: build - @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \ - ${MAKE_ARGS} PICFLAG="" stokes ; \ + @cd ${WRKSRC}; ${DO_MAKE_BUILD} PICFLAG="" stokes ; \ ./stokes 3 do-install: - @${INSTALL_DATA} ${WRKSRC}/kktdirect.h ${PREFIX}/include - @cd ${WRKDIR}; ${INSTALL_DATA} libkktdirect.a libkktdirect_pic.a \ - libkktdirect.so.0 ${PREFIX}/lib - @${LN} -sf libkktdirect.so.0 ${PREFIX}/lib/libkktdirect.so -.ifndef(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} -.endif -.ifndef(NOPORTEXAMPLES) - @${MKDIR} ${EXAMPLESDIR} - @cd ${WRKSRC}; ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR} + @${INSTALL_DATA} ${WRKSRC}/kktdirect.h ${STAGEDIR}${PREFIX}/include + @cd ${WRKDIR}; ${INSTALL_LIB} libkktdirect.a libkktdirect_pic.a \ + libkktdirect.so.0 ${STAGEDIR}${PREFIX}/lib + @cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libkktdirect.so.0 libkktdirect.so +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} +.endif +.if ${PORT_OPTIONS:MEXAMPLES} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + @cd ${WRKSRC}; ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR} .endif .include