Date: Sat, 5 Apr 2014 16:30:29 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350244 - in head/math: blas lapack lapack/files xlapack Message-ID: <201404051630.s35GUUbH071376@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Sat Apr 5 16:30:29 2014 New Revision: 350244 URL: http://svnweb.freebsd.org/changeset/ports/350244 QAT: https://qat.redports.org/buildarchive/r350244/ Log: Stage support With hat: portmgr Modified: head/math/blas/Makefile head/math/lapack/Makefile head/math/lapack/files/manpages head/math/xlapack/Makefile Modified: head/math/blas/Makefile ============================================================================== --- head/math/blas/Makefile Sat Apr 5 16:23:57 2014 (r350243) +++ head/math/blas/Makefile Sat Apr 5 16:30:29 2014 (r350244) @@ -12,5 +12,4 @@ BLAS_SLAVEPORT = yes MASTERDIR= ${.CURDIR}/../lapack -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/math/lapack/Makefile ============================================================================== --- head/math/lapack/Makefile Sat Apr 5 16:23:57 2014 (r350243) +++ head/math/lapack/Makefile Sat Apr 5 16:30:29 2014 (r350244) @@ -34,7 +34,6 @@ WRKSRC_PROFILE = ${WRKSRC}_PROFILE WRKSRC_SHARED= ${WRKSRC}_SHARED WRKSRC_STATIC= ${WRKSRC} -NO_STAGE= yes .include <bsd.port.options.mk> .if defined(BLAS_SLAVEPORT) @@ -47,7 +46,7 @@ TEST_TARGET= blas_testing .else ALL_TARGET= lib BLASLIB?= -L${LOCALBASE}/lib -lblas -LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas +LIB_DEPENDS+= libblas.so:${PORTSDIR}/math/blas LIBS= lapack tmglib SVERSION= 4 TEST_TARGET= lapack_testing @@ -58,12 +57,13 @@ USE_PYTHON_BUILD= yes S= \# .endif .if defined(XLAPACK_SLAVEPORT) -LIB_DEPENDS+= xblas.0:${PORTSDIR}/math/xblas +LIB_DEPENDS+= libxblas.so:${PORTSDIR}/math/xblas MAKE_ENV+= USEXBLAS=yes XBLASLIB="${XBLASLIB}" P= x PLIST_SUB+= BLAS="@comment " LAPACK="@comment " XLAPACK="" XBLASLIB?= -L${LOCALBASE}/lib -lxblas .else +PLIST_FILES+= ${MAN3L:S|^|man/man3/|:S|$|.gz|} PLIST_SUB+= BLAS="@comment " LAPACK="" XLAPACK="@comment " .if defined(MAINTAINER_MODE) BUILD_DEPENDS += doxygen:${PORTSDIR}/devel/doxygen @@ -168,15 +168,15 @@ test-${o:L}: build-${o:L} do-install: .for L in ${LIBS} .if ${PORT_OPTIONS:MSTATIC} - @${INSTALL_DATA} ${WRKSRC}/lib${L}.a ${PREFIX}/lib/lib${P}${L}.a + @${INSTALL_DATA} ${WRKSRC}/lib${L}.a ${STAGEDIR}${PREFIX}/lib/lib${P}${L}.a .endif .if ${PORT_OPTIONS:MSHARED} - @${INSTALL_DATA} ${WRKSRC_SHARED}/lib${L}.a ${PREFIX}/lib/lib${P}${L}_pic.a - @${INSTALL_DATA} ${WRKSRC_SHARED}/lib${P}${L}.so.${SVERSION} ${PREFIX}/lib - @${LN} -sf lib${P}${L}.so.${SVERSION} ${PREFIX}/lib/lib${P}${L}.so + @${INSTALL_DATA} ${WRKSRC_SHARED}/lib${L}.a ${STAGEDIR}${PREFIX}/lib/lib${P}${L}_pic.a + @${INSTALL_DATA} ${WRKSRC_SHARED}/lib${P}${L}.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib + @${LN} -sf lib${P}${L}.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib/lib${P}${L}.so .endif .if ${PORT_OPTIONS:MPROFILE} - @${INSTALL_DATA} ${WRKSRC_PROFILE}/lib${L}.a ${PREFIX}/lib/lib${P}${L}_p.a + @${INSTALL_DATA} ${WRKSRC_PROFILE}/lib${L}.a ${STAGEDIR}${PREFIX}/lib/lib${P}${L}_p.a .endif .endfor @@ -187,15 +187,15 @@ do-install: .include "${FILESDIR}/manpages" post-install: - @cd ${WRKDIR}/man ; ${ECHO_CMD} ${MAN3:S|^|man3/|} \ - | ${XARGS} -J @ ${INSTALL_MAN} @ ${MAN3PREFIX}/man/man3 + @cd ${WRKDIR}/man ; ${ECHO_CMD} ${MAN3L:S|^|man3/|} \ + | ${XARGS} -J @ ${INSTALL_MAN} @ ${STAGEDIR}${MAN3PREFIX}/man/man3 .if defined(MAINTAINER_MODE) package-manpages: build-manpages @${RM} -f ${WRKDIR}/lapack-manpages-${PORTVERSION}.tar.gz ; \ cd ${WRKSRC}/DOCS/man; \ ${TAR} -czvf ${WRKDIR}/lapack-manpages-${PORTVERSION}.tar.gz \ - ${MAN3:S|^|man3/|} + ${MAN3L:S|^|man3/|} .endif .endif Modified: head/math/lapack/files/manpages ============================================================================== --- head/math/lapack/files/manpages Sat Apr 5 16:23:57 2014 (r350243) +++ head/math/lapack/files/manpages Sat Apr 5 16:30:29 2014 (r350244) @@ -1,4 +1,4 @@ -MAN3= \ +MAN3L= \ INSTALL_ilaver.f.3 \ INSTALL_lsame.f.3 \ LAPACK_version.f.3 \ Modified: head/math/xlapack/Makefile ============================================================================== --- head/math/xlapack/Makefile Sat Apr 5 16:23:57 2014 (r350243) +++ head/math/xlapack/Makefile Sat Apr 5 16:30:29 2014 (r350244) @@ -11,5 +11,4 @@ XLAPACK_SLAVEPORT= yes MASTERDIR= ${.CURDIR}/../lapack -NO_STAGE= yes .include "${MASTERDIR}/Makefile"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404051630.s35GUUbH071376>