suitesparse: switch to mk/blas.bl3

[Dr. Thomas Orgis <thomas.orgis%uni-hamburg.de@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Dr. Thomas Orgis <thomas.orgis%uni-hamburg.de@localhost>
Pushed By:	thor
Date:		Tue Mar 26 17:51:50 2019 +0100
Changeset:	97aea744e8aa93887f9e7725073dd765478912f6

Modified Files:
	suitesparse/Makefile
	suitesparse/buildlink3.mk

Log Message:
suitesparse: switch to mk/blas.bl3

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=97aea744e8aa93887f9e7725073dd765478912f6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 suitesparse/Makefile      | 15 ++++++---------
 suitesparse/buildlink3.mk |  3 +--
 2 files changed, 7 insertions(+), 11 deletions(-)

diffs:
diff --git a/suitesparse/Makefile b/suitesparse/Makefile
index 380662a520..b5097890f5 100644
--- a/suitesparse/Makefile
+++ b/suitesparse/Makefile
@@ -5,6 +5,7 @@
 # PKGNAME=	suitesparse-3.6.1
 DISTNAME=	SuiteSparse-4.0.2
 PKGNAME=	suitesparse-4.0.2
+PKGREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://faculty.cse.tamu.edu/davis/SuiteSparse/
 #MASTER_SITES=	http://www.cise.ufl.edu/research/sparse/SuiteSparse/
@@ -33,9 +34,6 @@ LIB=		-lm
 LIB=		-lm -lrt
 .endif
 
-BLAS=		-lblas
-LAPACK=		-llapack
-
 # /home/bacon/Pkgsrc/pkgsrc-1/mk/pkgformat/pkg/list-dependencies: line 52: -e: command not found
 # Problem is ${SED} is empty
 # TOOLS_PLATFORM.gsed=	#empty
@@ -61,12 +59,12 @@ AUTO_MKDIRS=		yes
 INSTALLATION_DIRS=	include/suitesparse lib
 
 # Non-standard variables used by SuiteSparse Makefiles
-MAKE_FLAGS+=	BLAS="${LDFLAGS} ${BLAS}" \
+MAKE_FLAGS+=	BLAS="${LDFLAGS} ${BLAS_LIBS}" \
 		CHOLMOD_CONFIG="${CHOLMOD_CONFIG}" \
 		CPLUSPLUS="${CXX}" \
 		CF="${CFLAGS} ${CXXFLAGS}" \
 		F77FLAGS="${FFLAGS} ${PICFLAG}" \
-		LAPACK="${LDFLAGS} ${LAPACK}" \
+		LAPACK="${LDFLAGS} ${LAPACK_LIBS}" \
 		METIS="${METIS}" \
 		METIS_PATH="${METIS_PATH}" \
 		SPQR_CONFIG="${CHOLMOD_CONFIG}" \
@@ -76,14 +74,14 @@ post-patch:
 	${CP} ${FILESDIR}/SuiteSparse_config.mk ${WRKSRC}/SuiteSparse_config
 #	${FIND} ${WRKSRC} -type f \( -name 'Makefile' -o -name '*.mk' \) \
 		-exec gsed -i'.bak' -e '\|^AR =|s|ar|${AR}|' \
-			-e '\|^BLAS =|s|=.*|= ${LDFLAGS} ${BLAS}|' \
+			-e '\|^BLAS =|s|=.*|= ${LDFLAGS} ${BLAS_LIBS}|' \
 			-e '\|^CC =|d' \
 			-e '\|^CFLAGS =|{s|-O[1-9]\{0,1\}||g;s|=|= ${CFLAGS} $${PICFLAG} |;}' \
 			-e '\|^CHOLMOD_CONFIG =|s|=.*|= ${CHOLMOD_CONFIG}|' \
 			-e '\|^CPLUSPLUS =|s|=.*|= ${CXX}|' \
 			-e '\|^F77 =|d' \
 			-e '\|^F77FLAGS =|s|=.*|= ${FFLAGS} $${PICFLAG}|' \
-			-e '\|^LAPACK =|s|=.*|= ${LDFLAGS} ${LAPACK}|' \
+			-e '\|^LAPACK =|s|=.*|= ${LDFLAGS} ${LAPACK_LIBS}|' \
 			-e '\|^METIS =|s|=.*|= ${METIS}|' \
 			-e '\|^METIS_PATH =|s|=.*|= ${METIS_PATH}|' \
 			-e 's|-I\$$(METIS_PATH)/Lib|-I${METIS_PATH}|' \
@@ -126,7 +124,6 @@ do-install:
 #		j=$${i##*/} ;  ${LN} -sf $${j%.a}.so.${SVERSION} ${DESTDIR}${PREFIX}/lib/$${j%.a}.so ; \
 #	done
 
-.include "../../math/blas/buildlink3.mk"
-.include "../../math/lapack/buildlink3.mk"
+.include "../../wip/mk/blas.buildlink3.mk"
 .include "../../math/metis/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/suitesparse/buildlink3.mk b/suitesparse/buildlink3.mk
index a62d68af07..596bb65876 100644
--- a/suitesparse/buildlink3.mk
+++ b/suitesparse/buildlink3.mk
@@ -8,8 +8,7 @@ SUITESPARSE_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.suitesparse+=	suitesparse>=3.6.1
 BUILDLINK_PKGSRCDIR.suitesparse?=	../../wip/suitesparse
 
-.include "../../math/blas/buildlink3.mk"
-.include "../../math/lapack/buildlink3.mk"
+.include "../../wip/mk/blas.buildlink3.mk"
 .include "../../math/metis/buildlink3.mk"
 .endif	# SUITESPARSE_BUILDLINK3_MK