pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
lapack, cblas, lapacke, mk/blas.bl3: drop the -ng suffix
Module Name: pkgsrc-wip
Committed By: Dr. Thomas Orgis <thomas.orgis%uni-hamburg.de@localhost>
Pushed By: thor
Date: Tue Mar 26 16:44:36 2019 +0100
Changeset: dc454f4085fcbe5f1f8e757721c486dbfeee9bda
Modified Files:
cblas/DESCR
cblas/Makefile
cblas/PLIST
cblas/buildlink3.mk
mk/blas.buildlink3.mk
Added Files:
lapack/DESCR
lapack/Makefile
lapack/Makefile.common
lapack/PLIST
lapack/buildlink3.mk
lapack/distinfo
lapack/patches/patch-CMakeLists.txt
lapacke/DESCR
lapacke/Makefile
lapacke/PLIST
lapacke/buildlink3.mk
Removed Files:
cblas-ng/DESCR
cblas-ng/Makefile
cblas-ng/PLIST
cblas-ng/buildlink3.mk
cblas/distinfo
lapack-ng/DESCR
lapack-ng/Makefile
lapack-ng/Makefile.common
lapack-ng/PLIST
lapack-ng/buildlink3.mk
lapack-ng/distinfo
lapack-ng/patches/patch-CMakeLists.txt
lapacke-ng/DESCR
lapacke-ng/Makefile
lapacke-ng/PLIST
lapacke-ng/buildlink3.mk
Log Message:
lapack, cblas, lapacke, mk/blas.bl3: drop the -ng suffix
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=dc454f4085fcbe5f1f8e757721c486dbfeee9bda
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
cblas-ng/DESCR | 2 --
cblas-ng/Makefile | 13 --------
cblas-ng/PLIST | 11 -------
cblas-ng/buildlink3.mk | 14 --------
cblas/DESCR | 3 +-
cblas/Makefile | 58 +++++++---------------------------
cblas/PLIST | 8 ++++-
cblas/buildlink3.mk | 5 +--
cblas/distinfo | 6 ----
lapack-ng/DESCR | 13 --------
lapack-ng/Makefile | 10 ------
lapack-ng/Makefile.common | 40 -----------------------
lapack-ng/PLIST | 13 --------
lapack-ng/buildlink3.mk | 13 --------
lapack-ng/distinfo | 7 ----
lapack-ng/patches/patch-CMakeLists.txt | 55 --------------------------------
lapack/DESCR | 13 ++++++++
lapack/Makefile | 10 ++++++
lapack/Makefile.common | 38 ++++++++++++++++++++++
lapack/PLIST | 13 ++++++++
lapack/buildlink3.mk | 13 ++++++++
lapack/distinfo | 7 ++++
lapack/patches/patch-CMakeLists.txt | 55 ++++++++++++++++++++++++++++++++
lapacke-ng/DESCR | 2 --
lapacke-ng/Makefile | 13 --------
lapacke-ng/PLIST | 13 --------
lapacke-ng/buildlink3.mk | 14 --------
lapacke/DESCR | 2 ++
lapacke/Makefile | 13 ++++++++
lapacke/PLIST | 13 ++++++++
lapacke/buildlink3.mk | 14 ++++++++
mk/blas.buildlink3.mk | 2 +-
32 files changed, 215 insertions(+), 291 deletions(-)
diffs:
diff --git a/cblas-ng/DESCR b/cblas-ng/DESCR
deleted file mode 100644
index e3232c7f03..0000000000
--- a/cblas-ng/DESCR
+++ /dev/null
@@ -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.
diff --git a/cblas-ng/Makefile b/cblas-ng/Makefile
deleted file mode 100644
index 066ef4c495..0000000000
--- a/cblas-ng/Makefile
+++ /dev/null
@@ -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"
diff --git a/cblas-ng/PLIST b/cblas-ng/PLIST
deleted file mode 100644
index f240c8b080..0000000000
--- a/cblas-ng/PLIST
+++ /dev/null
@@ -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
diff --git a/cblas-ng/buildlink3.mk b/cblas-ng/buildlink3.mk
deleted file mode 100644
index b3ec63af65..0000000000
--- a/cblas-ng/buildlink3.mk
+++ /dev/null
@@ -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
diff --git a/cblas/DESCR b/cblas/DESCR
index 69b212a330..e3232c7f03 100644
--- a/cblas/DESCR
+++ b/cblas/DESCR
@@ -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.
diff --git a/cblas/Makefile b/cblas/Makefile
index d5c425794a..e306b6b88a 100644
--- a/cblas/Makefile
+++ b/cblas/Makefile
@@ -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
-
-MAINTAINER= bacon%NetBSD.org@localhost
-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"
+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/Makefile.common"
diff --git a/cblas/PLIST b/cblas/PLIST
index 010f10c953..f240c8b080 100644
--- a/cblas/PLIST
+++ b/cblas/PLIST
@@ -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
diff --git a/cblas/buildlink3.mk b/cblas/buildlink3.mk
index 060681228a..7b5ce9b6cb 100644
--- a/cblas/buildlink3.mk
+++ b/cblas/buildlink3.mk
@@ -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
diff --git a/cblas/distinfo b/cblas/distinfo
deleted file mode 100644
index a6f8a17b7a..0000000000
--- a/cblas/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD$
-
-SHA1 (cblas.tgz) = d6970cf52592ef67674a61c78bbd055a4e9d4680
-RMD160 (cblas.tgz) = ab908605311ad5dfe280c5fb0e6a1e94156b7a04
-SHA512 (cblas.tgz) = 1c64e6814529cd716890504d213e8cd90150348b9105e8da030718383241a5660d145a14f26e20d27b2aea72c87a9d46b754c6e48935e168d62842c04ba56401
-Size (cblas.tgz) = 197468 bytes
diff --git a/lapack-ng/DESCR b/lapack-ng/DESCR
deleted file mode 100644
index 086bc12090..0000000000
--- a/lapack-ng/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-LAPACK is a highly portable Fortran 77 library which provides routines
-for solving systems of simultaneous linear equations, least-squares
-solutions of linear systems of equations, eigenvalue problems, and
-singular value problems. The associated matrix factorizations (LU,
-Cholesky, QR, SVD, Schur, generalized Schur) are also provided, as are
-related computations such as reordering of the Schur factorizations
-and estimating condition numbers. Dense and banded matrices are
-handled, but not general sparse matrices. In all areas, similar
-functionality is provided for real and complex matrices, in both
-single and double precision.
-
-This package delivers only the base BLAS and LAPACK libraries from
-the Netlib reference code (not the C wrappers).
diff --git a/lapack-ng/Makefile b/lapack-ng/Makefile
deleted file mode 100644
index 9e9b8826d2..0000000000
--- a/lapack-ng/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD$
-
-COMMENT= Linear Algebra PACKage (Netlib reference code)
-LAPACK_PART= lapack
-LAPACK_PART_CMAKE_ARGS= \
- -DUSE_OPTIMIZED_BLAS=OFF \
- -DUSE_OPTIMIZED_LAPACK=OFF \
- -DCBLAS=OFF -DLAPACKE=OFF
-
-.include "../lapack-ng/Makefile.common"
diff --git a/lapack-ng/Makefile.common b/lapack-ng/Makefile.common
deleted file mode 100644
index 5a50d5e7ed..0000000000
--- a/lapack-ng/Makefile.common
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD$
-
-# Common Makefile for packages derived from the Netlib LAPACK sources.
-# You set LAPACK_PART (lowercase) and LAPACK_PART_CMAKE_ARGS to choose
-# the library to install.
-
-PORTVERSION= 3.8.0
-DISTNAME= lapack-${PORTVERSION}
-# TODO: remove the -ng once we replace the old math/lapack.
-PKGNAME= ${LAPACK_PART}-ng-${PORTVERSION}
-PKGREVISION= 1
-CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_NETLIB:=lapack/}
-EXTRACT_SUFX= .tar.gz
-
-MAINTAINER= thomas.orgis%uni-hamburg.de@localhost
-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
-
-USE_LANGUAGES= c fortran
-USE_CMAKE= yes
-
-WRKSRC= ${WRKDIR}/${DISTNAME}
-CONFIGURE_DIRS= ${WRKDIR}/build
-CMAKE_ARG_PATH= ${WRKSRC}
-
-CMAKE_ARGS= -DBUILD_DEPRECATED=yes \
- -DBUILD_SHARED_LIBS=ON \
- ${LAPACK_PART_CMAKE_ARGS}
-
-post-extract:
- ${RUN} mkdir -p ${WRKDIR}/build
-
-.include "../../mk/bsd.pkg.mk"
-
diff --git a/lapack-ng/PLIST b/lapack-ng/PLIST
deleted file mode 100644
index afd1efed2f..0000000000
--- a/lapack-ng/PLIST
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $NetBSD$
-lib/cmake/lapack-${PKGVERSION}/lapack-config-version.cmake
-lib/cmake/lapack-${PKGVERSION}/lapack-config.cmake
-lib/cmake/lapack-${PKGVERSION}/lapack-targets-release.cmake
-lib/cmake/lapack-${PKGVERSION}/lapack-targets.cmake
-lib/libblas.so
-lib/libblas.so.3
-lib/libblas.so.${PKGVERSION}
-lib/liblapack.so
-lib/liblapack.so.3
-lib/liblapack.so.${PKGVERSION}
-lib/pkgconfig/blas.pc
-lib/pkgconfig/lapack.pc
diff --git a/lapack-ng/buildlink3.mk b/lapack-ng/buildlink3.mk
deleted file mode 100644
index ee0a6e5d7e..0000000000
--- a/lapack-ng/buildlink3.mk
+++ /dev/null
@@ -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
diff --git a/lapack-ng/distinfo b/lapack-ng/distinfo
deleted file mode 100644
index 8c347f81ba..0000000000
--- a/lapack-ng/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.21 2017/09/11 20:56:28 wiz Exp $
-
-SHA1 (lapack-3.8.0.tar.gz) = 55ac9d6be510883c5442c8aca967722cdf58fb29
-RMD160 (lapack-3.8.0.tar.gz) = ff306181c4c125e7594c57c1eeece8b0aa8f8523
-SHA512 (lapack-3.8.0.tar.gz) = 17786cb7306fccdc9b4a242de7f64fc261ebe6a10b6ec55f519deb4cb673cb137e8742aa5698fd2dc52f1cd56d3bd116af3f593a01dcf6770c4dcc86c50b2a7f
-Size (lapack-3.8.0.tar.gz) = 7426094 bytes
-SHA1 (patch-CMakeLists.txt) = 3f93b4745b1e64fb248249b845c0a44761c382d6
diff --git a/lapack-ng/patches/patch-CMakeLists.txt b/lapack-ng/patches/patch-CMakeLists.txt
deleted file mode 100644
index 00e124f1f7..0000000000
--- a/lapack-ng/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD$
-
-Avoid installation of LAPACK CMake and pkg-config files when not installing
-LAPACK.
-
---- CMakeLists.txt.orig 2019-03-23 09:03:24.021091079 +0000
-+++ CMakeLists.txt
-@@ -332,10 +332,12 @@ include(CPack)
-
- if(NOT BLAS_FOUND)
- set(ALL_TARGETS ${ALL_TARGETS} blas)
-+ set(BLAS ON)
- endif()
-
- if(NOT LATESTLAPACK_FOUND)
- set(ALL_TARGETS ${ALL_TARGETS} lapack)
-+ set(LAPACK ON)
- endif()
-
- if(BUILD_TESTING OR LAPACKE_WITH_TMG)
-@@ -378,11 +380,13 @@ configure_file(${LAPACK_SOURCE_DIR}/CMAK
- ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY)
-
-
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
-- install(FILES
-- ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
-- DESTINATION ${PKG_CONFIG_DIR}
-- )
-+if(LAPACK)
-+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
-+ install(FILES
-+ ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
-+ DESTINATION ${PKG_CONFIG_DIR}
-+ )
-+endif()
-
- configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-install.cmake.in
- ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake @ONLY)
-@@ -394,8 +398,10 @@ write_basic_package_version_file(
- COMPATIBILITY SameMajorVersion
- )
-
--install(FILES
-- ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake
-- ${LAPACK_BINARY_DIR}/lapack-config-version.cmake
-- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapack-${LAPACK_VERSION}
-- )
-+if(LAPACK)
-+ install(FILES
-+ ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake
-+ ${LAPACK_BINARY_DIR}/lapack-config-version.cmake
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapack-${LAPACK_VERSION}
-+ )
-+endif()
diff --git a/lapack/DESCR b/lapack/DESCR
new file mode 100644
index 0000000000..086bc12090
--- /dev/null
+++ b/lapack/DESCR
@@ -0,0 +1,13 @@
+LAPACK is a highly portable Fortran 77 library which provides routines
+for solving systems of simultaneous linear equations, least-squares
+solutions of linear systems of equations, eigenvalue problems, and
+singular value problems. The associated matrix factorizations (LU,
+Cholesky, QR, SVD, Schur, generalized Schur) are also provided, as are
+related computations such as reordering of the Schur factorizations
+and estimating condition numbers. Dense and banded matrices are
+handled, but not general sparse matrices. In all areas, similar
+functionality is provided for real and complex matrices, in both
+single and double precision.
+
+This package delivers only the base BLAS and LAPACK libraries from
+the Netlib reference code (not the C wrappers).
diff --git a/lapack/Makefile b/lapack/Makefile
new file mode 100644
index 0000000000..6a67c959ba
--- /dev/null
+++ b/lapack/Makefile
@@ -0,0 +1,10 @@
+# $NetBSD$
+
+COMMENT= Linear Algebra PACKage (Netlib reference code)
+LAPACK_PART= lapack
+LAPACK_PART_CMAKE_ARGS= \
+ -DUSE_OPTIMIZED_BLAS=OFF \
+ -DUSE_OPTIMIZED_LAPACK=OFF \
+ -DCBLAS=OFF -DLAPACKE=OFF
+
+.include "../lapack/Makefile.common"
diff --git a/lapack/Makefile.common b/lapack/Makefile.common
new file mode 100644
index 0000000000..3b8a5d0fdf
--- /dev/null
+++ b/lapack/Makefile.common
@@ -0,0 +1,38 @@
+# $NetBSD$
+
+# Common Makefile for packages derived from the Netlib LAPACK sources.
+# You set LAPACK_PART (lowercase) and LAPACK_PART_CMAKE_ARGS to choose
+# the library to install.
+
+PORTVERSION= 3.8.0
+DISTNAME= lapack-${PORTVERSION}
+PKGNAME= ${LAPACK_PART}-${PORTVERSION}
+PKGREVISION= 1
+CATEGORIES= math
+MASTER_SITES= ${MASTER_SITE_NETLIB:=lapack/}
+EXTRACT_SUFX= .tar.gz
+
+MAINTAINER= thomas.orgis%uni-hamburg.de@localhost
+HOMEPAGE= http://www.netlib.org/lapack/
+LICENSE= modified-bsd
+
+# All parts are in the same section (now wip, later math).
+PATCHDIR= ${.CURDIR}/../lapack/patches
+DISTINFO_FILE= ${.CURDIR}/../lapack/distinfo
+
+USE_LANGUAGES= c fortran
+USE_CMAKE= yes
+
+WRKSRC= ${WRKDIR}/${DISTNAME}
+CONFIGURE_DIRS= ${WRKDIR}/build
+CMAKE_ARG_PATH= ${WRKSRC}
+
+CMAKE_ARGS= -DBUILD_DEPRECATED=yes \
+ -DBUILD_SHARED_LIBS=ON \
+ ${LAPACK_PART_CMAKE_ARGS}
+
+post-extract:
+ ${RUN} mkdir -p ${WRKDIR}/build
+
+.include "../../mk/bsd.pkg.mk"
+
diff --git a/lapack/PLIST b/lapack/PLIST
new file mode 100644
index 0000000000..afd1efed2f
--- /dev/null
+++ b/lapack/PLIST
@@ -0,0 +1,13 @@
+@comment $NetBSD$
+lib/cmake/lapack-${PKGVERSION}/lapack-config-version.cmake
+lib/cmake/lapack-${PKGVERSION}/lapack-config.cmake
+lib/cmake/lapack-${PKGVERSION}/lapack-targets-release.cmake
+lib/cmake/lapack-${PKGVERSION}/lapack-targets.cmake
+lib/libblas.so
+lib/libblas.so.3
+lib/libblas.so.${PKGVERSION}
+lib/liblapack.so
+lib/liblapack.so.3
+lib/liblapack.so.${PKGVERSION}
+lib/pkgconfig/blas.pc
+lib/pkgconfig/lapack.pc
diff --git a/lapack/buildlink3.mk b/lapack/buildlink3.mk
new file mode 100644
index 0000000000..711e7b392f
--- /dev/null
+++ b/lapack/buildlink3.mk
@@ -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
diff --git a/lapack/distinfo b/lapack/distinfo
new file mode 100644
index 0000000000..8c347f81ba
--- /dev/null
+++ b/lapack/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.21 2017/09/11 20:56:28 wiz Exp $
+
+SHA1 (lapack-3.8.0.tar.gz) = 55ac9d6be510883c5442c8aca967722cdf58fb29
+RMD160 (lapack-3.8.0.tar.gz) = ff306181c4c125e7594c57c1eeece8b0aa8f8523
+SHA512 (lapack-3.8.0.tar.gz) = 17786cb7306fccdc9b4a242de7f64fc261ebe6a10b6ec55f519deb4cb673cb137e8742aa5698fd2dc52f1cd56d3bd116af3f593a01dcf6770c4dcc86c50b2a7f
+Size (lapack-3.8.0.tar.gz) = 7426094 bytes
+SHA1 (patch-CMakeLists.txt) = 3f93b4745b1e64fb248249b845c0a44761c382d6
diff --git a/lapack/patches/patch-CMakeLists.txt b/lapack/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..00e124f1f7
--- /dev/null
+++ b/lapack/patches/patch-CMakeLists.txt
@@ -0,0 +1,55 @@
+$NetBSD$
+
+Avoid installation of LAPACK CMake and pkg-config files when not installing
+LAPACK.
+
+--- CMakeLists.txt.orig 2019-03-23 09:03:24.021091079 +0000
++++ CMakeLists.txt
+@@ -332,10 +332,12 @@ include(CPack)
+
+ if(NOT BLAS_FOUND)
+ set(ALL_TARGETS ${ALL_TARGETS} blas)
++ set(BLAS ON)
+ endif()
+
+ if(NOT LATESTLAPACK_FOUND)
+ set(ALL_TARGETS ${ALL_TARGETS} lapack)
++ set(LAPACK ON)
+ endif()
+
+ if(BUILD_TESTING OR LAPACKE_WITH_TMG)
+@@ -378,11 +380,13 @@ configure_file(${LAPACK_SOURCE_DIR}/CMAK
+ ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY)
+
+
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
+- install(FILES
+- ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
+- DESTINATION ${PKG_CONFIG_DIR}
+- )
++if(LAPACK)
++ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
++ install(FILES
++ ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
++ DESTINATION ${PKG_CONFIG_DIR}
++ )
++endif()
+
+ configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-install.cmake.in
+ ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake @ONLY)
+@@ -394,8 +398,10 @@ write_basic_package_version_file(
+ COMPATIBILITY SameMajorVersion
+ )
+
+-install(FILES
+- ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake
+- ${LAPACK_BINARY_DIR}/lapack-config-version.cmake
+- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapack-${LAPACK_VERSION}
+- )
++if(LAPACK)
++ install(FILES
++ ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake
++ ${LAPACK_BINARY_DIR}/lapack-config-version.cmake
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapack-${LAPACK_VERSION}
++ )
++endif()
diff --git a/lapacke-ng/DESCR b/lapacke-ng/DESCR
deleted file mode 100644
index f362526309..0000000000
--- a/lapacke-ng/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This is the C wrapper to the Linear Algebra PACKage (LAPACKE),
-extracted from the Netlib reference implementation of LAPACK.
diff --git a/lapacke-ng/Makefile b/lapacke-ng/Makefile
deleted file mode 100644
index 859d5473e2..0000000000
--- a/lapacke-ng/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD$
-
-COMMENT= C interface to a LAPACK library
-LAPACK_PART= lapacke
-LAPACK_PART_CMAKE_ARGS= \
- -DUSE_OPTIMIZED_BLAS=ON \
- -DBLAS_LIBRARIES=${BLAS_LIBS:Q} \
- -DUSE_OPTIMIZED_LAPACK=ON \
- -DLAPACK_LIBRARIES=${LAPACK_LIBS:Q} \
- -DCBLAS=OFF -DLAPACKE=ON
-
-.include "../../wip/mk/blas.buildlink3.mk"
-.include "../lapack-ng/Makefile.common"
diff --git a/lapacke-ng/PLIST b/lapacke-ng/PLIST
deleted file mode 100644
index 5d39ad2ad8..0000000000
--- a/lapacke-ng/PLIST
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $NetBSD$
-include/lapacke.h
-include/lapacke_config.h
-include/lapacke_mangling.h
-include/lapacke_utils.h
-lib/cmake/lapacke-${PKGVERSION}/lapacke-config-version.cmake
-lib/cmake/lapacke-${PKGVERSION}/lapacke-config.cmake
-lib/cmake/lapacke-${PKGVERSION}/lapacke-targets-release.cmake
-lib/cmake/lapacke-${PKGVERSION}/lapacke-targets.cmake
-lib/liblapacke.so
-lib/liblapacke.so.3
-lib/liblapacke.so.${PKGVERSION}
-lib/pkgconfig/lapacke.pc
diff --git a/lapacke-ng/buildlink3.mk b/lapacke-ng/buildlink3.mk
deleted file mode 100644
index 0064fa96f3..0000000000
--- a/lapacke-ng/buildlink3.mk
+++ /dev/null
@@ -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
diff --git a/lapacke/DESCR b/lapacke/DESCR
new file mode 100644
index 0000000000..f362526309
--- /dev/null
+++ b/lapacke/DESCR
@@ -0,0 +1,2 @@
+This is the C wrapper to the Linear Algebra PACKage (LAPACKE),
+extracted from the Netlib reference implementation of LAPACK.
diff --git a/lapacke/Makefile b/lapacke/Makefile
new file mode 100644
index 0000000000..ae4e0c5044
--- /dev/null
+++ b/lapacke/Makefile
@@ -0,0 +1,13 @@
+# $NetBSD$
+
+COMMENT= C interface to a LAPACK library
+LAPACK_PART= lapacke
+LAPACK_PART_CMAKE_ARGS= \
+ -DUSE_OPTIMIZED_BLAS=ON \
+ -DBLAS_LIBRARIES=${BLAS_LIBS:Q} \
+ -DUSE_OPTIMIZED_LAPACK=ON \
+ -DLAPACK_LIBRARIES=${LAPACK_LIBS:Q} \
+ -DCBLAS=OFF -DLAPACKE=ON
+
+.include "../../wip/mk/blas.buildlink3.mk"
+.include "../lapack/Makefile.common"
diff --git a/lapacke/PLIST b/lapacke/PLIST
new file mode 100644
index 0000000000..5d39ad2ad8
--- /dev/null
+++ b/lapacke/PLIST
@@ -0,0 +1,13 @@
+@comment $NetBSD$
+include/lapacke.h
+include/lapacke_config.h
+include/lapacke_mangling.h
+include/lapacke_utils.h
+lib/cmake/lapacke-${PKGVERSION}/lapacke-config-version.cmake
+lib/cmake/lapacke-${PKGVERSION}/lapacke-config.cmake
+lib/cmake/lapacke-${PKGVERSION}/lapacke-targets-release.cmake
+lib/cmake/lapacke-${PKGVERSION}/lapacke-targets.cmake
+lib/liblapacke.so
+lib/liblapacke.so.3
+lib/liblapacke.so.${PKGVERSION}
+lib/pkgconfig/lapacke.pc
diff --git a/lapacke/buildlink3.mk b/lapacke/buildlink3.mk
new file mode 100644
index 0000000000..addae08993
--- /dev/null
+++ b/lapacke/buildlink3.mk
@@ -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
diff --git a/mk/blas.buildlink3.mk b/mk/blas.buildlink3.mk
index c4237aa1c3..108d1b8ab9 100644
--- a/mk/blas.buildlink3.mk
+++ b/mk/blas.buildlink3.mk
@@ -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"
Home |
Main Index |
Thread Index |
Old Index