pkgsrc-WIP-changes archive

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

openblas: Fix pkglint issues, streamline comments



Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Thu Nov 5 10:13:00 2020 -0600
Changeset:	6a203d8f496fb1d00a8ea1dc8b011af900eb8d10

Modified Files:
	openblas/Makefile.common
	openblas/options.mk

Log Message:
openblas: Fix pkglint issues, streamline comments

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

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

diffstat:
 openblas/Makefile.common | 11 +++++++----
 openblas/options.mk      |  8 +++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diffs:
diff --git a/openblas/Makefile.common b/openblas/Makefile.common
index edfb832c3a..8fb05c547c 100644
--- a/openblas/Makefile.common
+++ b/openblas/Makefile.common
@@ -53,21 +53,24 @@ MAKE_FLAGS+=	FC=${FC:Q}
 # Default is detected from build host, which may differ from run host.
 BUILD_DEFS+=	OPENBLAS_THREAD_LIMIT
 
+.include "../../mk/bsd.prefs.mk"
+
 # Default checks number of cores of build host.
 # Do we want a pkgsrc-wide default?
 OPENBLAS_THREAD_LIMIT?=	# empty
 .if !empty(OPENBLAS_THREAD_LIMIT)
-MAKE_FLAGS+=	NUM_THREADS=${OPENBLAS_THREAD_LIMIT:Q}
+MAKE_FLAGS+=		NUM_THREADS=${OPENBLAS_THREAD_LIMIT:Q}
 .endif
 BENCHMARK_MAXTHREADS?=	8
+
 .if ${MACHINE_ARCH:M*64} == ""
-MAKE_FLAGS+=	BINARY32=1
+MAKE_FLAGS+=		BINARY32=1
 .else
-MAKE_FLAGS+=	BINARY64=1
+MAKE_FLAGS+=		BINARY64=1
 .endif
 # Those come in separate BLAS-agnostic packages.
 # ... except we start headaches about ILP64?
-MAKE_FLAGS+=	NO_CBLAS=1 NO_LAPACKE=1
+MAKE_FLAGS+=		NO_CBLAS=1 NO_LAPACKE=1
 
 # Separate headers and cmake stuff.
 MAKE_FLAGS+=	OPENBLAS_INCLUDE_DIR=${PREFIX}/include/${OPENBLAS_VARIANT}
diff --git a/openblas/options.mk b/openblas/options.mk
index 91c7d52938..f0d02370f0 100644
--- a/openblas/options.mk
+++ b/openblas/options.mk
@@ -1,8 +1,7 @@
 # $NetBSD$
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.openblas
-# Choose dynamic target/processor choice at runtime or
-# fixed build with build host CPU.
+# Auto-detect CPU features at runtime or use static features from build host
 PKG_SUPPORTED_OPTIONS=	dynamic-arch
 PKG_SUGGESTED_OPTIONS=	dynamic-arch
 
@@ -15,6 +14,5 @@ MAKE_FLAGS+=	DYNAMIC_ARCH=1
 MAKE_FLAGS+=	DYNAMIC_ARCH=0
 .endif
 
-# Other options create variants of the library, not
-# configurations of one. Especially INTERFACE64, which
-# changes the API!
+# Other options create variants of the library, not configurations of one.
+# Especially INTERFACE64, which changes the API!


Home | Main Index | Thread Index | Old Index