Date: Thu, 2 Apr 2015 06:45:11 +0000 (UTC) From: Maho Nakata <maho@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382985 - in head/math: lapack lapacke lapacke/files Message-ID: <201504020645.t326jBUF081673@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: maho Date: Thu Apr 2 06:45:10 2015 New Revision: 382985 URL: https://svnweb.freebsd.org/changeset/ports/382985 Log: math/lapacke : update port to slave port of math/lapack, and updated to 3.5.0 accordingly. PR: 98614 Submitted by: phd_kimberlite@yahoo.co.jp Deleted: head/math/lapacke/distinfo head/math/lapacke/files/ Modified: head/math/lapack/Makefile head/math/lapack/pkg-plist head/math/lapacke/Makefile Modified: head/math/lapack/Makefile ============================================================================== --- head/math/lapack/Makefile Thu Apr 2 06:08:28 2015 (r382984) +++ head/math/lapack/Makefile Thu Apr 2 06:45:10 2015 (r382985) @@ -39,9 +39,20 @@ WRKSRC_STATIC= ${WRKSRC} ALL_TARGET= blaslib BLASLIB= ../../libblas.a LIBS= blas -PLIST_SUB+= BLAS="" LAPACK="@comment " XLAPACK="@comment " +PLIST_SUB+= BLAS="" LAPACK="@comment " XLAPACK="@comment " LAPACKE="@comment " SVERSION= 2 TEST_TARGET= blas_testing +.elif defined(LAPACKE_SLAVEPORT) +ALL_TARGET= lapackelib +LAPACKELIB= liblapacke.a +LAPACKETMGLIB= liblapacke_tmg.a +MAKE_ENV+= LAPACKELIB="${LAPACKELIB}" LAPACKETMGLIB="${LAPACKETMGLIB}" +LIB_DEPENDS+= libblas.so:${PORTSDIR}/math/blas \ + liblapack.so:${PORTSDIR}/math/lapack +LIBS= lapacke lapacke_tmg +INCLS= lapacke lapacke_utils lapacke_mangling +PLIST_SUB+= BLAS="@comment " LAPACK="@comment " XLAPACK="@comment " LAPACKE="" +SVERSION= 1 .else ALL_TARGET= lib BLASLIB?= -L${LOCALBASE}/lib -lblas @@ -59,11 +70,11 @@ S= \# LIB_DEPENDS+= libxblas.so:${PORTSDIR}/math/xblas MAKE_ENV+= USEXBLAS=yes XBLASLIB="${XBLASLIB}" P= x -PLIST_SUB+= BLAS="@comment " LAPACK="@comment " XLAPACK="" +PLIST_SUB+= BLAS="@comment " LAPACK="@comment " XLAPACK="" LAPACKE="@comment " XBLASLIB?= -L${LOCALBASE}/lib -lxblas .else PLIST_FILES+= ${MAN3L:S|^|man/man3/|:S|$|.gz|} -PLIST_SUB+= BLAS="@comment " LAPACK="" XLAPACK="@comment " +PLIST_SUB+= BLAS="@comment " LAPACK="" XLAPACK="@comment " LAPACKE="@comment " .if defined(MAINTAINER_MODE) BUILD_DEPENDS += doxygen:${PORTSDIR}/devel/doxygen MAN_TARGET= build-manpages @@ -107,7 +118,9 @@ post-patch: s@^(OPTS[[:blank:]]*=)(.*)@\1 $${FFLAGS} $${EXTRAFLAGS}@; \ s@^NOOPT[[:blank:]]*=.*@& $${EXTRAFLAGS}@; \ s@^(LOADOPTS[[:blank:]]*=)(.*)@\1 $${LDFLAGS} $${EXTRAFLAGS}@; \ - \@(BLAS|RAN)LIB[[:blank:]]*=@d;' \ + s@^(CC[[:blank:]]*=)(.*)@@; \ + s@^(CFLAGS[[:blank:]]*)(=)(.*)@\1 += $${EXTRAFLAGS}@; \ + \@(BLAS|LAPACKE|RAN)LIB[[:blank:]]*=@d;' \ ${WRKSRC}/make.inc.example > ${WRKSRC}/make.inc @${REINPLACE_CMD} -e 's@\./lapack_testing\.py@${S} &@' \ ${WRKSRC}/Makefile @@ -153,8 +166,8 @@ TESTS ?= test-static TESTS ?= test-profile .endif +.if !defined(LAPACKE_SLAVEPORT) check regression-test test: ${TESTS} - .for o in PROFILE SHARED STATIC test-${o:tl}: build-${o:tl} .if ${PORT_OPTIONS:M${o}} @@ -164,9 +177,9 @@ test-${o:tl}: build-${o:tl} .if defined(BLAS_SLAVEPORT) @${CAT} ${WRKSRC_${o}}/BLAS/*.out .endif - .endif .endfor +.endif do-install: .for L in ${LIBS} @@ -182,10 +195,15 @@ do-install: @${INSTALL_DATA} ${WRKSRC_PROFILE}/lib${L}.a ${STAGEDIR}${PREFIX}/lib/lib${P}${L}_p.a .endif .endfor +.if defined(LAPACKE_SLAVEPORT) +.for I in ${INCLS} + @${INSTALL_DATA} ${WRKSRC}/lapacke/include/${I}.h ${STAGEDIR}${PREFIX}/include +.endfor +.endif .include <bsd.port.pre.mk> -.if !(defined(BLAS_SLAVEPORT) || defined(XLAPACK_SLAVEPORT)) +.if !(defined(BLAS_SLAVEPORT) || defined(XLAPACK_SLAVEPORT) || defined(LAPACKE_SLAVEPORT)) .include "${FILESDIR}/manpages" Modified: head/math/lapack/pkg-plist ============================================================================== --- head/math/lapack/pkg-plist Thu Apr 2 06:08:28 2015 (r382984) +++ head/math/lapack/pkg-plist Thu Apr 2 06:45:10 2015 (r382985) @@ -23,3 +23,16 @@ %%XLAPACK%%%%SHARED%%lib/libxtmglib.so %%XLAPACK%%%%SHARED%%lib/libxtmglib.so.%%SVERSION%% %%XLAPACK%%%%PROFILE%%lib/libxtmglib_p.a +%%LAPACKE%%include/lapacke.h +%%LAPACKE%%include/lapacke_utils.h +%%LAPACKE%%include/lapacke_mangling.h +%%LAPACKE%%%%STATIC%%lib/liblapacke.a +%%LAPACKE%%%%SHARED%%lib/liblapacke_pic.a +%%LAPACKE%%%%SHARED%%lib/liblapacke.so +%%LAPACKE%%%%SHARED%%lib/liblapacke.so.%%SVERSION%% +%%LAPACKE%%%%PROFILE%%lib/liblapacke_p.a +%%LAPACKE%%%%STATIC%%lib/liblapacke_tmg.a +%%LAPACKE%%%%SHARED%%lib/liblapacke_tmg_pic.a +%%LAPACKE%%%%SHARED%%lib/liblapacke_tmg.so +%%LAPACKE%%%%SHARED%%lib/liblapacke_tmg.so.%%SVERSION%% +%%LAPACKE%%%%PROFILE%%lib/liblapacke_tmg_p.a Modified: head/math/lapacke/Makefile ============================================================================== --- head/math/lapacke/Makefile Thu Apr 2 06:08:28 2015 (r382984) +++ head/math/lapacke/Makefile Thu Apr 2 06:45:10 2015 (r382985) @@ -2,13 +2,6 @@ # $FreeBSD$ PORTNAME= lapacke -PORTVERSION= 3.4.2 -PORTREVISION= 1 -CATEGORIES= math -MASTER_SITES= NL -MASTER_SITE_SUBDIR= lapack -DISTNAME= lapack-${PORTVERSION} -DIST_SUBDIR= lapack MAINTAINER= phd_kimberlite@yahoo.co.jp COMMENT= Standard C language APIs for LAPACK @@ -16,123 +9,9 @@ COMMENT= Standard C language APIs for LA LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -USE_LDCONFIG= yes -USES= fortran tar:tgz uidfix +DESCR= ${.CURDIR}/pkg-descr +LAPACKE_SLAVEPORT= yes -OPTIONS_DEFINE= PROFILE XLAPACKE DOCS -PROFILE_DESC= Build a profiling library -XLAPACKE_DESC= Install interfaces to XLAPACK - -.include <bsd.port.options.mk> - -LAPACKE_SVERSION= 1 -LAPACKE_LIBNAME= lapacke -LAPACKE_LIBNAME_TMG= lapacke_tmg -MAKE_ENV+= "SHLIB_MAJOR=${LAPACKE_SVERSION}" \ - "LAPACKE_LIBNAME=${LAPACKE_LIBNAME}" \ - "LAPACKE_LIBNAME_TMG=${LAPACKE_LIBNAME_TMG}" -.if ${PORT_OPTIONS:MXLAPACKE} -XLAPACKE_LIBNAME= xlapacke -MAKE_ENV+= "XLAPACKE_LIBNAME=${XLAPACKE_LIBNAME}" -.endif - -WRKSRC= ${WRKDIR}/${DISTNAME}/${PORTNAME} -WRKSRC_LEGACY= ${WRKDIR}/lapacke - -.if exists(${LOCALBASE}/lib/libgoto2p.so) -WITH_BLAS?= gotoblas -.elif exists(${LOCALBASE}/lib/libatlas.so) -WITH_BLAS?= atlas -.else -WITH_BLAS?= reference -.endif - -.if ${WITH_BLAS} == "reference" -LIB_DEPENDS+= libblas.so:${PORTSDIR}/math/blas \ - liblapack.so:${PORTSDIR}/math/lapack -BLAS= -lblas -LAPACK= -llapack -.elif ${WITH_BLAS} == "gotoblas" -LDFLAGS+= -lpthread -LIB_DEPENDS+= libgoto2p.so:${PORTSDIR}/math/gotoblas -BLAS= -lgoto2p -LAPACK= -lgoto2p -.elif ${WITH_BLAS} == "atlas" -LDFLAGS+= -lpthread -LIB_DEPENDS+= libatlas.so:${PORTSDIR}/math/atlas -BLAS= -lptf77blas -LAPACK= -lalapack -lptcblas -.endif -.if ${PORT_OPTIONS:MXLAPACKE} -LIB_DEPENDS+= libxlapack.so:${PORTSDIR}/math/xlapack -.endif - -LDFLAGS+= -L${LOCALBASE}/lib - -.if ${PORT_OPTIONS:MDOCS} -PORTDOCS= README -.endif -PLIST_FILES= include/lapacke.h \ - include/lapacke_utils.h \ - lib/lib${LAPACKE_LIBNAME}.a \ - lib/lib${LAPACKE_LIBNAME_TMG}.a \ - lib/lib${LAPACKE_LIBNAME}.so \ - lib/lib${LAPACKE_LIBNAME_TMG}.so \ - lib/lib${LAPACKE_LIBNAME}.so.${LAPACKE_SVERSION} \ - lib/lib${LAPACKE_LIBNAME_TMG}.so.${LAPACKE_SVERSION} -.if ${PORT_OPTIONS:MXLAPACKE} -PLIST_FILES+= lib/lib${XLAPACKE_LIBNAME}.a \ - lib/lib${XLAPACKE_LIBNAME}.so \ - lib/lib${XLAPACKE_LIBNAME}.so.${LAPACKE_SVERSION} -.endif - -.if ${PORT_OPTIONS:MPROFILE} -.if defined(NOPROFILE) || defined(NO_PROFILE) || defined(WITHOUT_PROFILE) -IGNORE= you have defined WITH_PROFILE, but have also defined\ -WITHOUT_PROFILE, NOPROFILE, or NO_PROFILE -.elif !exists(/usr/lib/libc_p.a) -IGNORE= you have chosen WITH_PROFILE, but have not installed the\ -base system profiling libraries -.endif -PLIST_FILES+= lib/lib${LAPACKE_LIBNAME}_p.a \ - lib/lib${LAPACKE_LIBNAME_TMG}_p.a -.if ${PORT_OPTIONS:MXLAPACKE} -PLIST_FILES+= lib/lib${XLAPACKE_LIBNAME}_p.a -.endif -.else -MAKE_ENV+= NO_PROFILE= -.endif - -post-patch: - @${FIND} ${WRKSRC} -name "Makefile*" -type f |\ - ${XARGS} ${REINPLACE_CMD} -e 's;$$(ARCH);$$(ARCH_);g' - @${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.dist - @${CP} ${FILESDIR}/Makefile ${WRKSRC}/Makefile - @${CP} ${WRKSRC}/include//lapacke_mangling_with_flags.h ${WRKSRC}/include//lapacke_mangling.h - @${MKDIR} ${WRKSRC}/lib - @${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}/lib/Makefile - @${MKDIR} ${WRKSRC}/libtmg - @${CP} ${FILESDIR}/Makefile.libtmg ${WRKSRC}/libtmg/Makefile - - @${REINPLACE_CMD} -e 's;%%XLAPACKE%%;;g' \ - -e 's;%%__XLAPACKE%%;\#;g' \ - ${WRKSRC}/lib/Makefile - -.if ${PORT_OPTIONS:MXLAPACKE} - @${MKDIR} ${WRKSRC}/libx - @${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}/libx/Makefile - @${REINPLACE_CMD} -e 's;%%__XLAPACKE%%;;g' \ - ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e 's;LAPACKE_LIBNAME;XLAPACKE_LIBNAME;g' \ - -e 's;%%XLAPACKE%%;\#;g' \ - -e 's;%%__XLAPACKE%%;;g' \ - ${WRKSRC}/libx/Makefile -.endif - -post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR} - @(cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) -.endif +MASTERDIR= ${.CURDIR}/../lapack -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504020645.t326jBUF081673>