pkgsrc-WIP-changes archive

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

wip/plink2: update for BLAS_C_INTERFACE



Module Name:	pkgsrc-wip
Committed By:	Dr. Thomas Orgis <thomas.orgis%uni-hamburg.de@localhost>
Pushed By:	thor
Date:		Tue Jun 15 09:44:16 2021 +0200
Changeset:	5e36fe8a552858daf35baf2c55bd7934575395d1

Modified Files:
	plink2/Makefile

Log Message:
wip/plink2: update for BLAS_C_INTERFACE

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

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

diffstat:
 plink2/Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diffs:
diff --git a/plink2/Makefile b/plink2/Makefile
index aca437dad3..84c249b300 100644
--- a/plink2/Makefile
+++ b/plink2/Makefile
@@ -32,10 +32,13 @@ SUBST_FILES.test=	${WRKSRC}/Tests/run_tests.sh
 SUBST_SED.test=		-e 's|../../build_dynamic|${PREFIX}/bin|g'
 SUBST_SED.test+=	-e 's|^python|${PYTHONBIN}|g'
 
-CFLAGS+=	-g -DDYNAMIC_ZLIB -I${PREFIX}/include
-CXXFLAGS+=	-g -DDYNAMIC_ZLIB -I${PREFIX}/include
+# TODO: accelerate.framework?
+BLAS_C_INTERFACE=	yes
 
-MAKE_FLAGS+=	ZLIB=-lz BLASFLAGS64="-L${PREFIX}/lib -lcblas ${LAPACK_LIBS} ${BLAS_LIBS}"
+CFLAGS+=	-g -DDYNAMIC_ZLIB -I${PREFIX}/include ${BLAS_INCLUDES}
+CXXFLAGS+=	-g -DDYNAMIC_ZLIB -I${PREFIX}/include ${BLAS_INCLUDES}
+
+MAKE_FLAGS+=	ZLIB=-lz BLASFLAGS64="-L${PREFIX}/lib  ${LAPACK_LIBS} ${CBLAS_LIBS}"
 # Keep debug info until at least next beta
 # INSTALL_TARGET=	install-strip
 
@@ -59,7 +62,6 @@ post-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/plink2-bench ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/blas.buildlink3.mk"
-.include "../../math/cblas/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"


Home | Main Index | Thread Index | Old Index