pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

plink: Switch to new blas framework



Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Wed May 1 12:18:53 2019 -0500
Changeset:	554a43f4ecd3fd61b0dc3732cbafbafd46912733

Modified Files:
	plink/Makefile

Log Message:
plink: Switch to new blas framework

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

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

diffstat:
 plink/Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diffs:
diff --git a/plink/Makefile b/plink/Makefile
index 9fd62a2ac3..7fb7929039 100644
--- a/plink/Makefile
+++ b/plink/Makefile
@@ -26,7 +26,8 @@ WRKSRC=		${WRKDIR}/plink-ng-${GITHUB_TAG}/1.9
 
 CFLAGS+=	-DDYNAMIC_ZLIB -I${PREFIX}/include -I.
 CXXFLAGS+=	-DDYNAMIC_ZLIB -I${PREFIX}/include
-MAKE_FLAGS+=	ZLIB=-lz BLASFLAGS="-L${PREFIX}/lib -llapack -lcblas -lblas -lpthread"
+# MAKE_FLAGS+=	ZLIB=-lz BLASFLAGS="-L${PREFIX}/lib -llapack -lcblas -lblas -lpthread"
+MAKE_FLAGS+=	ZLIB=-lz BLASFLAGS="-L${PREFIX}/lib ${BLAS_LIBS} -lcblas -lpthread"
 INSTALL_TARGET=	install-strip
 
 PORTVERSION=	1.90b4
@@ -40,8 +41,9 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/plink ${DESTDIR}${PREFIX}/bin
 
 .include "../../wip/cblas/buildlink3.mk"
-.include "../../math/blas/buildlink3.mk"
-.include "../../math/lapack/buildlink3.mk"
+.include "../../wip/mk/blas.buildlink3.mk"
+# .include "../../math/blas/buildlink3.mk"
+# .include "../../math/lapack/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"


Home | Main Index | Thread Index | Old Index