Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 1 Jan 2024 11:52:11 GMT
From:      Thierry Thomas <thierry@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: cc1715e889fd - main - math/*: upgrade blas, lapack, cblas, xlapack and lapacke to 3.12.0
Message-ID:  <202401011152.401BqBsu000911@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by thierry:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cc1715e889fd1210a2051cd6a22e3e3eaca18dce

commit cc1715e889fd1210a2051cd6a22e3e3eaca18dce
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2023-12-20 14:14:36 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2024-01-01 11:43:45 +0000

    math/*: upgrade blas, lapack, cblas, xlapack and lapacke to 3.12.0
    
    Release notes at
            <https://github.com/Reference-LAPACK/lapack/releases/tag/v3.12.0>;
    
    PR:             275860
    Exp-run by:     antoine@
---
 math/lapack/Makefile                   | 15 ++++++---------
 math/lapack/distinfo                   | 10 +++++-----
 math/lapack/files/patch-CMakeLists.txt | 10 ++++++++++
 math/lapack/pkg-plist                  |  1 +
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/math/lapack/Makefile b/math/lapack/Makefile
index 6dc9fce94a62..4ba78403cad4 100644
--- a/math/lapack/Makefile
+++ b/math/lapack/Makefile
@@ -1,15 +1,15 @@
 PORTNAME?=	lapack
-PORTVERSION=	3.11.0
+PORTVERSION=	3.12.0
 .if !(defined(BLAS_SLAVEPORT) || defined(CBLAS_SLAVEPORT) || defined(XLAPACK_SLAVEPORT) || defined(LAPACKE_SLAVEPORT))
-PORTREVISION=	1
+PORTREVISION=	0
 .else
-PORTREVISION?=	1	# Never remove this line, keep PORTREVISION?=0 in case.
+PORTREVISION?=	0	# Never remove this line, keep PORTREVISION?=0 in case.
 .endif
 CATEGORIES=	math
 MASTER_SITES=	https://github.com/Reference-LAPACK/lapack/archive/refs/tags/:src	\
 		http://www.netlib.org/lapack/:man	\
 		LOCAL/thierry/lapack-${PORTVERSION}/:man
-DISTFILES=	v${PORTVERSION:R}${EXTRACT_SUFX}:src
+DISTFILES=	v${PORTVERSION}${EXTRACT_SUFX}:src
 .if make(makesum) || !(defined(BLAS_SLAVEPORT) || defined(XLAPACK_SLAVEPORT))
 DISTFILES+=	manpages.tgz:man
 .endif
@@ -22,7 +22,7 @@ WWW?=		https://www.netlib.org/lapack/
 LICENSE?=	BSD3CLAUSE
 
 USES=		cmake:testing cpe fortran
-WRKSRC=		${WRKDIR}/lapack-${PORTVERSION:R}
+WRKSRC=		${WRKDIR}/lapack-${PORTVERSION}
 # The actual math/scilab needs deprecated functions - to be removed later
 CMAKE_ON=	BUILD_SHARED_LIBS BUILD_DEPRECATED
 USE_LDCONFIG=	yes
@@ -73,6 +73,7 @@ PLIST_SUB+=		BLAS="@comment " CBLAS="@comment " LAPACK="@comment " XLAPACK="" LA
 LIB_DEPENDS+=		libblas.so:math/blas
 . if defined(MAINTAINER_MODE)
 USES+=			python:build,test
+BINARY_ALIAS+=		python3=${PYTHON_CMD}
 . endif
 CMAKE_ON+=		USE_OPTIMIZED_BLAS BUILD_TESTING
 CMAKE_ARGS+=		-DBLAS_LIBRARIES="${LOCALBASE}/lib/libblas.so"
@@ -101,10 +102,6 @@ pre-configure:
 		${WRKSRC}/Makefile
 	${FIND} ${WRKSRC} -name Makefile | ${XARGS}	\
 		${SED} -i ".bak" -e 's|^ifdef|.ifdef|;s|^endif|.endif|'
-.if defined(MAINTAINER_MODE)
-	${REINPLACE_CMD} -e 's|PythonInterp 2.7|PythonInterp ${PYTHON_VER}|'	\
-		${WRKSRC}/CMakeLists.txt
-.endif
 
 post-build:
 .if defined(BLAS_SLAVEPORT)
diff --git a/math/lapack/distinfo b/math/lapack/distinfo
index 3d099753d270..6d36ccb5ea6b 100644
--- a/math/lapack/distinfo
+++ b/math/lapack/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1668549742
-SHA256 (lapack-3.11.0/v3.11.tar.gz) = 5a5b3bac27709d8c66286b7a0d1d7bf2d7170ec189a1a756fdf812c97aa7fd10
-SIZE (lapack-3.11.0/v3.11.tar.gz) = 7723909
-SHA256 (lapack-3.11.0/manpages.tgz) = 6e3aff37f95c6a5af48b9395af2ade102213ad391d1cbe1a1638c815925950c2
-SIZE (lapack-3.11.0/manpages.tgz) = 2478363
+TIMESTAMP = 1703076157
+SHA256 (lapack-3.12.0/v3.12.0.tar.gz) = eac9570f8e0ad6f30ce4b963f4f033f0f643e7c3912fc9ee6cd99120675ad48b
+SIZE (lapack-3.12.0/v3.12.0.tar.gz) = 7933607
+SHA256 (lapack-3.12.0/manpages.tgz) = 342db80461de2c0f10848a3f338ee6e7511b417f459600a7e75ad4dc4bf05f5a
+SIZE (lapack-3.12.0/manpages.tgz) = 5396817
diff --git a/math/lapack/files/patch-CMakeLists.txt b/math/lapack/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..db50ddd14eee
--- /dev/null
+++ b/math/lapack/files/patch-CMakeLists.txt
@@ -0,0 +1,10 @@
+--- CMakeLists.txt.orig	2023-11-24 20:41:15 UTC
++++ CMakeLists.txt
+@@ -223,6 +223,7 @@ if(BLAS_LIBRARIES)
+ 
+ # Check the usage of the user provided BLAS libraries
+ if(BLAS_LIBRARIES)
++  enable_language(Fortran)
+   include(CheckFortranFunctionExists)
+   set(CMAKE_REQUIRED_LIBRARIES ${BLAS_LIBRARIES})
+   CHECK_FORTRAN_FUNCTION_EXISTS("dgemm" BLAS_FOUND)
diff --git a/math/lapack/pkg-plist b/math/lapack/pkg-plist
index a65522115702..11d882f39734 100644
--- a/math/lapack/pkg-plist
+++ b/math/lapack/pkg-plist
@@ -1,4 +1,5 @@
 %%CBLAS%%include/cblas/cblas.h
+%%CBLAS%%include/cblas/cblas_64.h
 %%CBLAS%%include/cblas/cblas_f77.h
 %%CBLAS%%include/cblas/cblas_mangling.h
 %%LAPACKE%%include/lapacke/lapack.h



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401011152.401BqBsu000911>