From owner-svn-ports-all@FreeBSD.ORG Tue Jul 8 14:11:31 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 04D72703; Tue, 8 Jul 2014 14:11:31 +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 DB92E2701; Tue, 8 Jul 2014 14:11:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s68EBUpd097526; Tue, 8 Jul 2014 14:11:30 GMT (envelope-from bf@svn.freebsd.org) Received: (from bf@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s68EBUxn097525; Tue, 8 Jul 2014 14:11:30 GMT (envelope-from bf@svn.freebsd.org) Message-Id: <201407081411.s68EBUxn097525@svn.freebsd.org> From: Brendan Fabeny Date: Tue, 8 Jul 2014 14:11:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361247 - head/math/superlu_mt 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 14:11:31 -0000 Author: bf Date: Tue Jul 8 14:11:30 2014 New Revision: 361247 URL: http://svnweb.freebsd.org/changeset/ports/361247 QAT: https://qat.redports.org/buildarchive/r361247/ Log: Use staging Modified: head/math/superlu_mt/Makefile Modified: head/math/superlu_mt/Makefile ============================================================================== --- head/math/superlu_mt/Makefile Tue Jul 8 13:54:24 2014 (r361246) +++ head/math/superlu_mt/Makefile Tue Jul 8 14:11:30 2014 (r361247) @@ -8,9 +8,7 @@ CATEGORIES= math MASTER_SITES= http://crd.lbl.gov/~xiaoye/SuperLU/ \ http://crd.lbl.gov/~xiaoye/:doc DISTNAME= ${PORTNAME}_2.0 -.ifndef NOPORTDOCS DISTFILES= ${DISTNAME}${EXTRACT_SUFX} simax97.ps.gz:doc -.endif DIST_SUBDIR= superlu2 EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -19,7 +17,6 @@ COMMENT= Routines for performing multith USES= fortran gmake -NO_STAGE= yes .include .if exists(${LOCALBASE}/lib/libgoto2.so) @@ -31,14 +28,14 @@ WITH_BLAS?= reference .endif .if ${WITH_BLAS} == reference -LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas +LIB_DEPENDS+= libblas.so:${PORTSDIR}/math/blas BLAS= -lblas .elif ${WITH_BLAS} == gotoblas -LIB_DEPENDS+= goto2:${PORTSDIR}/math/gotoblas +LIB_DEPENDS+= libgoto2.so:${PORTSDIR}/math/gotoblas BLAS= -lgoto2p BROKEN= Build stops while testing .elif ${WITH_BLAS} == atlas -LIB_DEPENDS+= atlas:${PORTSDIR}/math/atlas +LIB_DEPENDS+= libatlas.so:${PORTSDIR}/math/atlas BLAS= -lptf77blas .endif @@ -102,21 +99,23 @@ do-build: ${FIND} ${WRKSRC_SHARED} -name "*\.a" -exec ${CP} {} ${WRKDIR}/tmp_shared \; @cd ${WRKDIR}/tmp_shared ; for i in `ls *.a | ${SED} 's/\.a//' `; do \ ${RM} -f $${i}.so.* $${i}.so ; \ - ld -Bshareable -o $${i}.so.${SVERSION} -x -soname $${i}.so.${SVERSION} --allow-multiple-definition --whole-archive $${i}.a ;\ + ${FC} ${CFLAGS} ${FPIC} ${LDFLAGS} -shared -o $${i}.so.${SVERSION} \ + -Wl,-soname,$${i}.so.${SVERSION} -Wl,--allow-multiple-definition \ + -Wl,--whole-archive $${i}.a -Wl,--no-whole-archive -Wl,--as-needed; \ ${LN} -s $${i}.so.${SVERSION} $${i}.so ;\ done do-install: - ${INSTALL_DATA} ${WRKDIR}/tmp_static/libsuperlu_mt.a ${PREFIX}/lib - ${INSTALL_DATA} ${WRKDIR}/tmp_shared/libsuperlu_mt.so.${SVERSION} ${PREFIX}/lib - cd ${PREFIX}/lib && ${LN} -s -f libsuperlu_mt.so.${SVERSION} libsuperlu_mt.so - ${MKDIR} ${PREFIX}/include/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/SRC/*.h ${PREFIX}/include/${PORTNAME} -.ifndef NOPORTDOCS - @${MKDIR} ${DOCSDIR} -# ${INSTALL_DATA} ${WRKSRC}/INSTALL/*.ps ${DOCSDIR} -# ${GZIP_CMD} ${DOCSDIR}/*.ps - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/simax97.ps.gz ${DOCSDIR} + ${INSTALL_LIB} ${WRKDIR}/tmp_static/libsuperlu_mt.a ${STAGEDIR}${PREFIX}/lib + ${INSTALL_LIB} ${WRKDIR}/tmp_shared/libsuperlu_mt.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib + cd ${STAGEDIR}${PREFIX}/lib && ${LN} -s -f libsuperlu_mt.so.${SVERSION} libsuperlu_mt.so + ${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/SRC/*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME} +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${DOCSDIR} +# ${INSTALL_DATA} ${WRKSRC}/INSTALL/*.ps ${STAGEDIR}${DOCSDIR} +# ${GZIP_CMD} ${STAGEDIR}${DOCSDIR}/*.ps + ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/simax97.ps.gz ${STAGEDIR}${DOCSDIR} .endif regression-test: do-build