plink2: Additional build options, switch to openblas

[Jason W. Bacon <bacon%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jason W. Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Mon May 7 19:43:40 2018 -0500
Changeset:	793e1adb7d2692a9c9520821f413ca52a62df23e

Modified Files:
	plink2/Makefile
	plink2/options.mk

Log Message:
plink2: Additional build options, switch to openblas

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

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

diffstat:
 plink2/Makefile   | 12 ++++++------
 plink2/options.mk | 12 +++++++++++-
 2 files changed, 17 insertions(+), 7 deletions(-)

diffs:
diff --git a/plink2/Makefile b/plink2/Makefile
index 3a8cb5cffb..187b2490dd 100644
--- a/plink2/Makefile
+++ b/plink2/Makefile
@@ -27,19 +27,19 @@ 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
 
 PORTVERSION=	0.0.0.20180504
-# PREFER.zlib=pkgsrc	# Requires newer version than NetBSD 7.1 provides
+USE_BUILTIN.zlib=	no
 
 .include "options.mk"
 
-#.include "../../wip/openblas_pthread/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"
diff --git a/plink2/options.mk b/plink2/options.mk
index 5c0badb2a5..1af9fc5bb8 100644
--- a/plink2/options.mk
+++ b/plink2/options.mk
@@ -1,8 +1,18 @@
+# $NetBSD$
+
 PKG_OPTIONS_VAR=	PKG_OPTIONS.plink2
-PKG_SUPPORTED_OPTIONS=	native
+PKG_SUPPORTED_OPTIONS=	native sse42 avx2
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mnative)
 CFLAGS+=	-march=native
 .endif
+
+.if !empty(PKG_OPTIONS:Msse42)
+CFLAGS+=	-msse4.2
+.endif
+
+.if !empty(PKG_OPTIONS:Mavx2)
+CFLAGS+=	-mavx2 -mbmi -mbmi2 -mlzcnt
+.endif