lapack, cblas, lapacke, mk/blas.bl3: drop the -ng suffix

This commit is contained in:
Dr. Thomas Orgis 2019-03-26 16:44:36 +01:00
parent a99b351944
commit dc454f4085
23 changed files with 55 additions and 131 deletions

View File

@ -1,2 +0,0 @@
This is the C wrapper to the Basic Linear Algebra Support library
(CBLAS), extracted from the Netlib reference implementation of LAPACK.

View File

@ -1,13 +0,0 @@
# $NetBSD$
COMMENT= C interface to a BLAS library
LAPACK_PART= cblas
LAPACK_PART_CMAKE_ARGS= \
-DUSE_OPTIMIZED_BLAS=ON \
-DBLAS_LIBRARIES=${BLAS_LIBS:Q} \
-DUSE_OPTIMIZED_LAPACK=ON \
-DLAPACK_LIBRARIES=${LAPACK_LIBS:Q} \
-DCBLAS=ON -DLAPACKE=OFF
.include "../../wip/mk/blas.buildlink3.mk"
.include "../lapack-ng/Makefile.common"

View File

@ -1,11 +0,0 @@
@comment $NetBSD$
include/cblas.h
include/cblas_f77.h
include/cblas_mangling.h
include/cblas_test.h
lib/cmake/cblas-${PKGVERSION}/cblas-config-version.cmake
lib/cmake/cblas-${PKGVERSION}/cblas-config.cmake
lib/libcblas.so
lib/libcblas.so.3
lib/libcblas.so.${PKGVERSION}
lib/pkgconfig/cblas.pc

View File

@ -1,14 +0,0 @@
# $NetBSD$
BUILDLINK_TREE+= cblas-ng
.if !defined(CBLAS_NG_BUILDLINK3_MK)
CBLAS_NG_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.cblas-ng+= cblas-ng>=3.8.0
BUILDLINK_PKGSRCDIR.cblas-ng?= ../../wip/cblas-ng
.include "../../wip/mk/blas.buildlink3.mk"
.endif
BUILDLINK_TREE+= -cblas-ng

View File

@ -1 +1,2 @@
C bindings and headers for BLAS library.
This is the C wrapper to the Basic Linear Algebra Support library
(CBLAS), extracted from the Netlib reference implementation of LAPACK.

View File

@ -1,49 +1,13 @@
# $NetBSD$
DISTNAME= cblas
PKGNAME= cblas-1.0
CATEGORIES= math
MASTER_SITES= http://www.netlib.org/blas/blast-forum/
EXTRACT_SUFX= .tgz
COMMENT= C interface to a BLAS library
LAPACK_PART= cblas
LAPACK_PART_CMAKE_ARGS= \
-DUSE_OPTIMIZED_BLAS=ON \
-DBLAS_LIBRARIES=${BLAS_LIBS:Q} \
-DUSE_OPTIMIZED_LAPACK=ON \
-DLAPACK_LIBRARIES=${LAPACK_LIBS:Q} \
-DCBLAS=ON -DLAPACKE=OFF
MAINTAINER= bacon@NetBSD.org
HOMEPAGE= http://www.netlib.org/blas/blast-forum/
COMMENT= C bindings and headers for BLAS library
# Not sure about this. FreeBSD port has custom blas license.
LICENSE= modified-bsd
WRKSRC= ${WRKDIR}/CBLAS
USE_LANGUAGES= c fortran
SUBST_CLASSES+= libblas
SUBST_STAGE.libblas= post-patch
SUBST_SED.libblas= -e 's|libblas.a|-L${PREFIX}/lib -lblas|g'
SUBST_SED.libblas+= -e 's|cblas_$$(PLAT)|libcblas|g'
SUBST_SED.libblas+= -e 's|= -O3|+=|g'
SUBST_SED.libblas+= -e 's|CC =|CC ?=|g'
SUBST_SED.libblas+= -e 's|FC =|FC ?=|g'
SUBST_FILES.libblas= Makefile.in
# Can't find -lssp* on NetBSD 7.0.1
PKGSRC_USE_SSP= no
CFLAGS+= -fPIC
FFLAGS+= -fPIC
INSTALLATION_DIRS= include lib
post-extract:
${CP} ${WRKSRC}/Makefile.LINUX ${WRKSRC}/Makefile.in
post-build:
${MKDIR} ${WRKSRC}/shared-lib
${CHMOD} a-x ${WRKSRC}/lib/libcblas.a
cd ${WRKSRC}/shared-lib && \
${AR} x ../lib/libcblas.a && \
${FC} ${LDFLAGS} -shared -o ../lib/libcblas.so *.o
do-install:
${INSTALL_LIB} ${WRKSRC}/lib/libcblas.* ${DESTDIR}${PREFIX}/lib
${INSTALL_DATA} ${WRKSRC}/include/*.h ${DESTDIR}${PREFIX}/include
.include "../../math/blas/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
.include "../../wip/mk/blas.buildlink3.mk"
.include "../lapack/Makefile.common"

View File

@ -1,5 +1,11 @@
@comment $NetBSD$
include/cblas.h
include/cblas_f77.h
lib/libcblas.a
include/cblas_mangling.h
include/cblas_test.h
lib/cmake/cblas-${PKGVERSION}/cblas-config-version.cmake
lib/cmake/cblas-${PKGVERSION}/cblas-config.cmake
lib/libcblas.so
lib/libcblas.so.3
lib/libcblas.so.${PKGVERSION}
lib/pkgconfig/cblas.pc

View File

@ -5,9 +5,10 @@ BUILDLINK_TREE+= cblas
.if !defined(CBLAS_BUILDLINK3_MK)
CBLAS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.cblas+= cblas>=1.0
BUILDLINK_API_DEPENDS.cblas+= cblas>=3.8.0
BUILDLINK_PKGSRCDIR.cblas?= ../../wip/cblas
BUILDLINK_DEPMETHOD.cblas?= full
.include "../../wip/mk/blas.buildlink3.mk"
.endif
BUILDLINK_TREE+= -cblas

View File

@ -1,6 +0,0 @@
$NetBSD$
SHA1 (cblas.tgz) = d6970cf52592ef67674a61c78bbd055a4e9d4680
RMD160 (cblas.tgz) = ab908605311ad5dfe280c5fb0e6a1e94156b7a04
SHA512 (cblas.tgz) = 1c64e6814529cd716890504d213e8cd90150348b9105e8da030718383241a5660d145a14f26e20d27b2aea72c87a9d46b754c6e48935e168d62842c04ba56401
Size (cblas.tgz) = 197468 bytes

View File

@ -1,13 +0,0 @@
# $NetBSD$
BUILDLINK_TREE+= lapack-ng
.if !defined(LAPACK_NG_BUILDLINK3_MK)
LAPACK_NG_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.lapack-ng+= lapack-ng>=3.8.0
BUILDLINK_ABI_DEPENDS.lapack-ng+= lapack-ng>=3.8.0
BUILDLINK_PKGSRCDIR.lapack-ng?= ../../wip/lapack-ng
.endif # LAPACK_NG_BUILDLINK3_MK
BUILDLINK_TREE+= -lapack-ng

View File

@ -7,4 +7,4 @@ LAPACK_PART_CMAKE_ARGS= \
-DUSE_OPTIMIZED_LAPACK=OFF \
-DCBLAS=OFF -DLAPACKE=OFF
.include "../lapack-ng/Makefile.common"
.include "../lapack/Makefile.common"

View File

@ -6,8 +6,7 @@
PORTVERSION= 3.8.0
DISTNAME= lapack-${PORTVERSION}
# TODO: remove the -ng once we replace the old math/lapack.
PKGNAME= ${LAPACK_PART}-ng-${PORTVERSION}
PKGNAME= ${LAPACK_PART}-${PORTVERSION}
PKGREVISION= 1
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_NETLIB:=lapack/}
@ -18,9 +17,8 @@ HOMEPAGE= http://www.netlib.org/lapack/
LICENSE= modified-bsd
# All parts are in the same section (now wip, later math).
# TODO: remove the -ng once we replace the old math/lapack
PATCHDIR= ${.CURDIR}/../lapack-ng/patches
DISTINFO_FILE= ${.CURDIR}/../lapack-ng/distinfo
PATCHDIR= ${.CURDIR}/../lapack/patches
DISTINFO_FILE= ${.CURDIR}/../lapack/distinfo
USE_LANGUAGES= c fortran
USE_CMAKE= yes

13
lapack/buildlink3.mk Normal file
View File

@ -0,0 +1,13 @@
# $NetBSD$
BUILDLINK_TREE+= lapack
.if !defined(LAPACK_BUILDLINK3_MK)
LAPACK_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.lapack+= lapack>=3.8.0
BUILDLINK_ABI_DEPENDS.lapack+= lapack>=3.8.0
BUILDLINK_PKGSRCDIR.lapack?= ../../wip/lapack
.endif # LAPACK_BUILDLINK3_MK
BUILDLINK_TREE+= -lapack

View File

@ -1,14 +0,0 @@
# $NetBSD$
BUILDLINK_TREE+= lapacke-ng
.if !defined(LAPACKE_NG_BUILDLINK3_MK)
LAPACKE_NG_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.lapacke-ng+= lapacke-ng>=3.8.0
BUILDLINK_PKGSRCDIR.lapacke-ng?= ../../wip/lapacke-ng
.include "../../wip/mk/blas.buildlink3.mk"
.endif
BUILDLINK_TREE+= -lapacke-ng

View File

@ -10,4 +10,4 @@ LAPACK_PART_CMAKE_ARGS= \
-DCBLAS=OFF -DLAPACKE=ON
.include "../../wip/mk/blas.buildlink3.mk"
.include "../lapack-ng/Makefile.common"
.include "../lapack/Makefile.common"

14
lapacke/buildlink3.mk Normal file
View File

@ -0,0 +1,14 @@
# $NetBSD$
BUILDLINK_TREE+= lapacke
.if !defined(LAPACKE_BUILDLINK3_MK)
LAPACKE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.lapacke+= lapacke>=3.8.0
BUILDLINK_PKGSRCDIR.lapacke?= ../../wip/lapacke
.include "../../wip/mk/blas.buildlink3.mk"
.endif
BUILDLINK_TREE+= -lapacke

View File

@ -46,7 +46,7 @@ _BLAS_TYPE= none
. endif
.if $(_BLAS_TYPE) == "netlib"
_BLAS_PACKAGE= wip/lapack-ng
_BLAS_PACKAGE= wip/lapack
BLAS_LIBS= -lblas
LAPACK_LIBS= -llapack ${BLAS_LIBS}
.elif $(_BLAS_TYPE) == "openblas"