pkgsrc-WIP-changes archive

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

plink2: Patch for new interchangeable BLAS



Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Fri Jul 26 17:57:10 2019 -0500
Changeset:	b821472645d91db187576390c78f02ca4363a844

Modified Files:
	plink2/Makefile

Log Message:
plink2: Patch for new interchangeable BLAS

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

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

diffstat:
 plink2/Makefile | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diffs:
diff --git a/plink2/Makefile b/plink2/Makefile
index 4b0feadba4..72687dd46e 100644
--- a/plink2/Makefile
+++ b/plink2/Makefile
@@ -34,8 +34,7 @@ SUBST_SED.test+=	-e 's|^python|${PYTHONBIN}|g'
 CFLAGS+=	-g -DDYNAMIC_ZLIB -I${PREFIX}/include
 CXXFLAGS+=	-g -DDYNAMIC_ZLIB -I${PREFIX}/include
 
-# MAKE_FLAGS+=	ZLIB=-lz BLASFLAGS64="-L${PREFIX}/lib -lopenblas"
-MAKE_FLAGS+=	ZLIB=-lz BLASFLAGS64="-L${PREFIX}/lib -lcblas ${BLAS_LIBS}"
+MAKE_FLAGS+=	ZLIB=-lz BLASFLAGS64="-L${PREFIX}/lib -lcblas ${LAPACK_LIBS} ${BLAS_LIBS}"
 # Keep debug info until at least next beta
 # INSTALL_TARGET=	install-strip
 
@@ -46,19 +45,18 @@ MAKE_FILE=	${FILESDIR}/Makefile.generic
 
 DATADIR=	${PREFIX}/share/plink2
 
+post-patch:
+	${SED} -e "s|%%DATADIR%%|${DATADIR}|g" ${FILESDIR}/plink2-test.in \
+		> ${WRKDIR}/plink2-test
+
 post-install:
 	(cd ${WRKSRC} && pax -rw Tests ${DESTDIR}${DATADIR})
 	${CHMOD} a+x \
 		${DESTDIR}${DATADIR}/Tests/run_tests.sh \
 		${DESTDIR}${DATADIR}/Tests/*/run_tests.sh
-	# ${CHMOD} -R a+rX ${DESTDIR}${DATADIR}/Tests
-	${SED} -e "s|%%DATADIR%%|${DATADIR}|g" ${FILESDIR}/plink2-test.in \
-		> ${WRKDIR}/plink2-test
 	${INSTALL_SCRIPT} ${WRKDIR}/plink2-test ${DESTDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${FILESDIR}/plink2-bench ${DESTDIR}${PREFIX}/bin
 
-# .include "../../wip/openblas/buildlink3.mk"
-# .include "../../math/blas/buildlink3.mk"
 .include "../../wip/mk/blas.buildlink3.mk"
 .include "../../wip/cblas/buildlink3.mk"
 .include "../../lang/python/application.mk"


Home | Main Index | Thread Index | Old Index