pkgsrc-WIP-changes archive

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

plink2: Revert to netlib blas until openblas build issues are fixed



Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon4000%gmail.com@localhost>
Pushed By:	outpaddling
Date:		Fri May 11 10:44:58 2018 -0500
Changeset:	6a7166791be25e888a53a04adab438b1ff68f612

Modified Files:
	plink2/Makefile

Log Message:
plink2: Revert to netlib blas until openblas build issues are fixed

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

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, 5 insertions(+), 5 deletions(-)

diffs:
diff --git a/plink2/Makefile b/plink2/Makefile
index 187b2490dd..ee561d6f48 100644
--- a/plink2/Makefile
+++ b/plink2/Makefile
@@ -27,8 +27,8 @@ CFLAGS+=	-g -DDYNAMIC_ZLIB -I${PREFIX}/include
 CXXFLAGS+=	-g -DDYNAMIC_ZLIB -I${PREFIX}/include
 
 # Check this
-MAKE_FLAGS+=	ZLIB=-lz BLASFLAGS64="-L${PREFIX}/lib -lopenblas"
-# MAKE_FLAGS+=	ZLIB=-lz BLASFLAGS64="-L${PREFIX}/lib -llapack -lcblas -lblas"
+# MAKE_FLAGS+=	ZLIB=-lz BLASFLAGS64="-L${PREFIX}/lib -lopenblas"
+MAKE_FLAGS+=	ZLIB=-lz BLASFLAGS64="-L${PREFIX}/lib -llapack -lcblas -lblas"
 # Keep debug info until at least next beta
 # INSTALL_TARGET=	install-strip
 
@@ -37,9 +37,9 @@ USE_BUILTIN.zlib=	no
 
 .include "options.mk"
 
-.include "../../wip/openblas/buildlink3.mk"
-# .include "../../math/blas/buildlink3.mk"
-# .include "../../math/lapack/buildlink3.mk"
+# .include "../../wip/openblas/buildlink3.mk"
+.include "../../math/blas/buildlink3.mk"
+.include "../../math/lapack/buildlink3.mk"
 .include "../../wip/cblas/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"


Home | Main Index | Thread Index | Old Index