From 83f2653d3bc6e59425a0e7b5a8d89928ea0cc23e Mon Sep 17 00:00:00 2001 From: Antoine Brodin Date: Sat, 5 Apr 2014 16:30:29 +0000 Subject: [PATCH] Stage support With hat: portmgr --- math/blas/Makefile | 1 - math/lapack/Makefile | 22 +++++++++++----------- math/lapack/files/manpages | 2 +- math/xlapack/Makefile | 1 - 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/math/blas/Makefile b/math/blas/Makefile index ea7597c1bb73..55d35d33362f 100644 --- a/math/blas/Makefile +++ b/math/blas/Makefile @@ -12,5 +12,4 @@ BLAS_SLAVEPORT = yes MASTERDIR= ${.CURDIR}/../lapack -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/math/lapack/Makefile b/math/lapack/Makefile index e5a77beb14f9..23755a8d4f88 100644 --- a/math/lapack/Makefile +++ b/math/lapack/Makefile @@ -34,7 +34,6 @@ WRKSRC_PROFILE = ${WRKSRC}_PROFILE WRKSRC_SHARED= ${WRKSRC}_SHARED WRKSRC_STATIC= ${WRKSRC} -NO_STAGE= yes .include .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 diff --git a/math/lapack/files/manpages b/math/lapack/files/manpages index 3207793c3041..7005df85d75f 100644 --- a/math/lapack/files/manpages +++ b/math/lapack/files/manpages @@ -1,4 +1,4 @@ -MAN3= \ +MAN3L= \ INSTALL_ilaver.f.3 \ INSTALL_lsame.f.3 \ LAPACK_version.f.3 \ diff --git a/math/xlapack/Makefile b/math/xlapack/Makefile index fcf7d55a7228..2597b3991174 100644 --- a/math/xlapack/Makefile +++ b/math/xlapack/Makefile @@ -11,5 +11,4 @@ XLAPACK_SLAVEPORT= yes MASTERDIR= ${.CURDIR}/../lapack -NO_STAGE= yes .include "${MASTERDIR}/Makefile"