pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

openblas: Clean up pkglint issues

Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Fri Aug 16 10:56:52 2019 -0500
Changeset:	1009263970473f0715aa4ef7c67c5fe92873be26

Modified Files:
	openblas/Makefile
	openblas/Makefile.common
	openblas/distinfo
	openblas/options.mk
	openblas/patches/patch-Makefile
	openblas/patches/patch-Makefile.install
	openblas/patches/patch-Makefile.rule
	openblas/patches/patch-Makefile.system
	openblas/patches/patch-c_check
	openblas/patches/patch-common__arm.h
	openblas/patches/patch-cpuid__arm.c
	openblas/patches/patch-cpuid__arm64.c
	openblas/patches/patch-cpuid_ia64.c
	openblas/patches/patch-driver_others_memory.c
	openblas/patches/patch-exports+Makefile
	openblas/patches/patch-f_check
	openblas/patches/patch-getarch.c
	openblas/patches/patch-interface__ztrmv.c

Log Message:
openblas: Clean up pkglint issues

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

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

diffstat:
 openblas/Makefile                             |  2 +-
 openblas/Makefile.common                      | 38 ++++++++++++++-------------
 openblas/distinfo                             | 28 ++++++++++----------
 openblas/options.mk                           |  6 +++--
 openblas/patches/patch-Makefile               |  3 ++-
 openblas/patches/patch-Makefile.install       |  3 ++-
 openblas/patches/patch-Makefile.rule          |  3 ++-
 openblas/patches/patch-Makefile.system        |  1 +
 openblas/patches/patch-c_check                |  3 ++-
 openblas/patches/patch-common__arm.h          |  3 ++-
 openblas/patches/patch-cpuid__arm.c           |  3 ++-
 openblas/patches/patch-cpuid__arm64.c         |  3 ++-
 openblas/patches/patch-cpuid_ia64.c           |  3 ++-
 openblas/patches/patch-driver_others_memory.c |  3 ++-
 openblas/patches/patch-exports+Makefile       |  3 ++-
 openblas/patches/patch-f_check                |  3 ++-
 openblas/patches/patch-getarch.c              |  3 ++-
 openblas/patches/patch-interface__ztrmv.c     |  3 ++-
 18 files changed, 66 insertions(+), 48 deletions(-)

diffs:
diff --git a/openblas/Makefile b/openblas/Makefile
index 076d727196..6f4e70b5b8 100644
--- a/openblas/Makefile
+++ b/openblas/Makefile
@@ -1,4 +1,4 @@
 # $NetBSD$
 
 OPENBLAS_VARIANT= openblas
-.include "../openblas/Makefile.common"
+.include "../../wip/openblas/Makefile.common"
diff --git a/openblas/Makefile.common b/openblas/Makefile.common
index 1990159622..771e7cc340 100644
--- a/openblas/Makefile.common
+++ b/openblas/Makefile.common
@@ -3,6 +3,7 @@
 # used by wip/openblas_pthread/Makefile
 # used by wip/openblas_openmp/Makefile
 # used by wip/openblas/Makefile
+#
 # This is the common Makefile for OpenBLAS builds. It depends on
 # OPENBLAS_VARIANT = (openblas|openblas_pthread|openblas_openmp)
 # being set.
@@ -27,7 +28,7 @@ PATCHDIR=	${.CURDIR}/../../wip/openblas/patches
 PLIST_SRC=	${.CURDIR}/../../wip/openblas/PLIST
 PLIST_SUBST+=	OPENBLAS_VARIANT=${OPENBLAS_VARIANT}
 
-# NetBSD: Cannot find -lssp*
+# FIXME: NetBSD Cannot find -lssp*
 PKGSRC_USE_SSP=	no
 
 MAINTAINER=	thomas.orgis%uni-hamburg.de@localhost
@@ -56,8 +57,11 @@ MAKE_FLAGS+=	FFLAGS=${FFLAGS:Q}
 # Default is detected from build 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}
 .endif
@@ -90,20 +94,19 @@ MAKE_FLAGS+=	LIBNAMESUFFIX=openmp USE_OPENMP=1 NO_AFFINITY=1
 .endif
 
 SUBST_CLASSES+=		find
-SUBST_STAGE.find=	post-patch
+SUBST_STAGE.find=	pre-build
 SUBST_SED.find+=	-e "s+%%FIND%%+${FIND}+"
 SUBST_SED.find+=	-e "s+%%XARGS%%+${XARGS}+"
-SUBST_SED.find+=	-e "s+%%REINPLACE_CMD%%+${REINPLACE_CMD}+"
 SUBST_FILES.find+=	${WRKSRC}/Makefile
 
 SUBST_CLASSES+=		compiler
-SUBST_STAGE.compiler=	post-patch
-SUBST_SED.compiler+=	-e "s+%%FC%%+${FC}+"
-SUBST_SED.compiler+=	-e "s+%%CC%%+${CC}+"
+SUBST_STAGE.compiler=	pre-build
+SUBST_SED.compiler+=	-e "s+%%FC%%+"${FC:Q}"+"
+SUBST_SED.compiler+=	-e "s+%%CC%%+"${CC:Q}"+"
 SUBST_FILES.compiler+=	${WRKSRC}/Makefile.rule
 
 SUBST_CLASSES+=		arch
-SUBST_STAGE.arch=	post-patch
+SUBST_STAGE.arch=	pre-build
 SUBST_SED.arch+=	-e "s+(ARCH)+(ARCH_)+"
 SUBST_FILES.arch+=	${WRKSRC}/Makefile.rule
 SUBST_FILES.arch+=	${WRKSRC}/Makefile.tail
@@ -122,42 +125,41 @@ SUBST_FILES.arch+=	${WRKSRC}/lapack-netlib/LAPACKE/utils/Makefile
 SUBST_FILES.arch+=	${WRKSRC}/reference/Makefile
 
 SUBST_CLASSES+=		system
-SUBST_STAGE.system=	post-patch
+SUBST_STAGE.system=	pre-build
 SUBST_SED.system+=	-e "s+(ARCH)+(ARCH_)+"
-SUBST_SED.system+=	-e 's+%%LDFLAGS%%+${LDFLAGS}+'
+SUBST_SED.system+=	-e 's+%%LDFLAGS%%+'${LDFLAGS:Q}'+'
 SUBST_SED.system+=	-e 's+%%LOCALBASE%%+${PREFIX}+'
 SUBST_SED.system+=	-e 's+%%FIND%%+${FIND}+'
 SUBST_SED.system+=	-e 's+%%XARGS%%+${XARGS}+'
-SUBST_SED.system+=	-e 's+%%REINPLACE_CMD%%+${REINPLACE_CMD}+'
 SUBST_SED.system+=	-e 's+$${CROSS_SUFFIX}+${PREFIX}/bin/+'
 SUBST_SED.system+=	-e '/Clang.*OpenMP/g'
 SUBST_FILES.system+=	${WRKSRC}/Makefile.system
 
 SUBST_CLASSES+=		threads
-SUBST_STAGE.threads=	post-patch
+SUBST_STAGE.threads=	pre-build
 SUBST_SED.threads+=	-e "s+OPENBLAS_NUM_THREADS+OMP_NUM_THREADS+g"
 SUBST_FILES.threads+=	${WRKSRC}/test/Makefile
 SUBST_FILES.threads+=	${WRKSRC}/ctest/Makefile
 
 # Fix up pkgconfig file installation.
 SUBST_CLASSES+=		pc
-SUBST_STAGE.pc=		post-patch
+SUBST_STAGE.pc=		pre-build
 SUBST_SED.pc+=		-e 's+-lopenblas+-l${OPENBLAS_VARIANT}+'
 SUBST_SED.pc+=		-e 's+openblas.pc"+${OPENBLAS_VARIANT}.pc"+'
 SUBST_FILES.pc+=	Makefile.install openblas.pc.in
 
 post-extract:
-	cd ${DISTDIR}/${DIST_SUBDIR} ; \
-		${CP} ${LARGE_FILE} ${TIMING_FILE} ${WRKSRC}
+	(cd ${DISTDIR}/${DIST_SUBDIR} && \
+		${CP} ${LARGE_FILE} ${TIMING_FILE} ${WRKSRC})
 
 # This builds some benchmark programs you can call
 # from ${WRKSRC} afterwards.
 .PHONY: benchmark
 benchmark: build
-	cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${BENCHMARK_ENV} \
-	  ${MAKE_PROGRAM} ${MAKE_FLAGS} hpl
-	cd ${WRKSRC}/benchmark ; ${SETENV} ${MAKE_ENV} \
-	  ${BENCHMARK_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
+	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${BENCHMARK_ENV} \
+	  ${MAKE_PROGRAM} ${MAKE_FLAGS} hpl)
+	(cd ${WRKSRC}/benchmark && ${SETENV} ${MAKE_ENV} \
+	  ${BENCHMARK_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS})
 
 .include "options.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/openblas/distinfo b/openblas/distinfo
index 8559e7581e..2957560d43 100644
--- a/openblas/distinfo
+++ b/openblas/distinfo
@@ -12,17 +12,17 @@ SHA1 (openblas/timing.tgz) = fd47fc3f26d142a791df51e4a422a49662507252
 RMD160 (openblas/timing.tgz) = f0fe220e7ab611d4db8d8cab960361955e2ab093
 SHA512 (openblas/timing.tgz) = be0abfcfffdf0e118ed7e25a8451639833cf0ad6bb04d101bbe194c16f656b6ce509b2f76acf4ad626d1fb5b126bd5498cfea262f2946c2d077751112a2906af
 Size (openblas/timing.tgz) = 1059485 bytes
-SHA1 (patch-Makefile) = be2840ae6bad78b097d9aa313d533453831ff1c3
-SHA1 (patch-Makefile.install) = bb5a0eb80e9b13c18bd06bb7a03e7b0f256a7bcb
-SHA1 (patch-Makefile.rule) = 72108fa4d1e8279f78c01606d21b9149947afdaa
-SHA1 (patch-Makefile.system) = 5bb9ab4d21b3f8e131e03572ef312d46085f5a09
-SHA1 (patch-c_check) = 32af951c38db716e3ec81b8c7d4c985368561b8e
-SHA1 (patch-common__arm.h) = 1cc14adb8441d3282d57f1b44d69251f86f51392
-SHA1 (patch-cpuid__arm.c) = b1890daa38f15ad122b3f151563836349c00e9b3
-SHA1 (patch-cpuid__arm64.c) = eb2f5cb73f365c5cdc35c6dd2f3244e5082e26a0
-SHA1 (patch-cpuid_ia64.c) = f33294230098a7fb1ef49dd1557b2a07ed11a3a9
-SHA1 (patch-driver_others_memory.c) = 76d7ef5cfcf2a322182ed454a7416a8323329417
-SHA1 (patch-exports+Makefile) = a2d2084c31b439d3d22cdc5a32dcb7aec2bd0467
-SHA1 (patch-f_check) = 11751e7e779790a47f80f825555bb24d072d0f30
-SHA1 (patch-getarch.c) = 8e6d0ab14b2fb42827b7cad91030672ab1aaab4c
-SHA1 (patch-interface__ztrmv.c) = fefab5887bfc735fb5050df051f39b03201cee2c
+SHA1 (patch-Makefile) = e430fecf10b51ebc5fd0d38258b03a2af8c7fdb6
+SHA1 (patch-Makefile.install) = d7c5ee17feb43843060a36e9b7de693f06944db9
+SHA1 (patch-Makefile.rule) = ec2663c22ca68059181fe90047b97131764ea32a
+SHA1 (patch-Makefile.system) = a288bb24a8d2352a2da6d76c5042a2f50fc89a67
+SHA1 (patch-c_check) = c5990809434a259399c75e660aad5abe83899548
+SHA1 (patch-common__arm.h) = f08ec61bee8317daac267e90a79f46097b3431c9
+SHA1 (patch-cpuid__arm.c) = 20f95cede90cbe548c0cd09ed2e3d37d1d4aeabd
+SHA1 (patch-cpuid__arm64.c) = bbeb7222b32ec821511a6798fc27ff7269700662
+SHA1 (patch-cpuid_ia64.c) = 39649319b8c0a37b8d494e3c03b1ddb6fb616603
+SHA1 (patch-driver_others_memory.c) = 24adfd60c4baade965745bb6c21c6a3f955e4e50
+SHA1 (patch-exports+Makefile) = b1b087f07cffa3b0338a1cae8155995ebb658b30
+SHA1 (patch-f_check) = 9162d6a31f96c6af5aada82f6e78cf0385384215
+SHA1 (patch-getarch.c) = 3d0ea5b989c6402d9e2f03a6cc2de848f06ca16d
+SHA1 (patch-interface__ztrmv.c) = 6038946f8fb9542e680178ece2bd0d0d5853baad
diff --git a/openblas/options.mk b/openblas/options.mk
index 8bf386f14a..7e49c3314d 100644
--- a/openblas/options.mk
+++ b/openblas/options.mk
@@ -1,7 +1,9 @@
+# $NetBSD$
+
 PKG_OPTIONS_VAR=		PKG_OPTIONS.openblas
 # Choose dynamic target/processor choice at runtime or
 # fixed build with build host CPU.
-PKG_OPTIONS_GROUP.target=	dynamic fixed
+PKG_OPTIONS_GROUP.target=	dynamic
 PKG_OPTIONS_REQUIRED_GROUPS=	target
 PKG_SUGGESTED_OPTIONS=		dynamic
 
@@ -15,5 +17,5 @@ MAKE_FLAGS+=	DYNAMIC_ARCH=0
 .endif
 
 # Other options create variants of the library, not
-# configurations of one. Especially INTERFACE64, wich
+# configurations of one. Especially INTERFACE64, which
 # changes the API!
diff --git a/openblas/patches/patch-Makefile b/openblas/patches/patch-Makefile
index 148dd028e6..be34d7180d 100644
--- a/openblas/patches/patch-Makefile
+++ b/openblas/patches/patch-Makefile
@@ -1,6 +1,7 @@
 $NetBSD$
 
-# Remove special library names.
+Remove special library names.
+
 --- Makefile.orig	2018-12-31 23:09:59.000000000 +0100
 +++ Makefile	2019-03-22 18:49:13.168527565 +0100
 @@ -100,7 +100,6 @@
diff --git a/openblas/patches/patch-Makefile.install b/openblas/patches/patch-Makefile.install
index b9c7d6f013..4ab384222e 100644
--- a/openblas/patches/patch-Makefile.install
+++ b/openblas/patches/patch-Makefile.install
@@ -1,6 +1,7 @@
-@NetBSD@
+$NetBSD$
 
 Second part of removing the special library names.
+
 --- Makefile.install.orig	2018-12-31 23:09:59.000000000 +0100
 +++ Makefile.install	2019-03-22 17:43:08.922196943 +0100
 @@ -61,8 +61,6 @@
diff --git a/openblas/patches/patch-Makefile.rule b/openblas/patches/patch-Makefile.rule
index d2a24961a1..c113abc5e8 100644
--- a/openblas/patches/patch-Makefile.rule
+++ b/openblas/patches/patch-Makefile.rule
@@ -1,6 +1,7 @@
 $NetBSD$
 
-# Respect env
+Respect env
+
 --- Makefile.rule.orig	2015-10-27 20:44:50 UTC
 +++ Makefile.rule
 @@ -19,10 +19,10 @@ VERSION = 0.2.15
diff --git a/openblas/patches/patch-Makefile.system b/openblas/patches/patch-Makefile.system
index 0c1e5c7409..1c4ec2c655 100644
--- a/openblas/patches/patch-Makefile.system
+++ b/openblas/patches/patch-Makefile.system
@@ -2,6 +2,7 @@ $NetBSD$
 
 Fully control the library name via LIBNAMESUFFIX
 And the ARCH_ thing.
+
 --- Makefile.system.orig	2018-12-31 23:09:59.000000000 +0100
 +++ Makefile.system	2019-03-22 17:52:10.951870000 +0100
 @@ -265,6 +265,7 @@
diff --git a/openblas/patches/patch-c_check b/openblas/patches/patch-c_check
index 8993dcb9e9..65267308d1 100644
--- a/openblas/patches/patch-c_check
+++ b/openblas/patches/patch-c_check
@@ -1,6 +1,7 @@
 $NetBSD$
 
-# Avoid name collision on ARCH
+Avoid name collision on ARCH
+
 --- c_check.orig	2015-10-27 20:44:50 UTC
 +++ c_check
 @@ -235,7 +235,7 @@ open(CONFFILE, "> $config"  ) || die "Ca
diff --git a/openblas/patches/patch-common__arm.h b/openblas/patches/patch-common__arm.h
index a8c49440be..1cee5a53a3 100644
--- a/openblas/patches/patch-common__arm.h
+++ b/openblas/patches/patch-common__arm.h
@@ -1,6 +1,7 @@
 $NetBSD$
 
-# Add clang support
+Add clang support
+
 --- common_arm.h.orig	2016-09-01 03:58:42 UTC
 +++ common_arm.h
 @@ -93,6 +93,13 @@ static inline int blas_quickdivide(blasi
diff --git a/openblas/patches/patch-cpuid__arm.c b/openblas/patches/patch-cpuid__arm.c
index 4d6d357e14..d1be0d3afe 100644
--- a/openblas/patches/patch-cpuid__arm.c
+++ b/openblas/patches/patch-cpuid__arm.c
@@ -1,6 +1,7 @@
 $NetBSD$
 
-# Add default arm processor type
+Add default arm processor type
+
 --- cpuid_arm.c.orig	2016-09-01 03:58:42 UTC
 +++ cpuid_arm.c
 @@ -181,7 +181,8 @@ int detect(void)
diff --git a/openblas/patches/patch-cpuid__arm64.c b/openblas/patches/patch-cpuid__arm64.c
index bcbd67c8ba..20bb64804c 100644
--- a/openblas/patches/patch-cpuid__arm64.c
+++ b/openblas/patches/patch-cpuid__arm64.c
@@ -1,6 +1,7 @@
 $NetBSD$
 
-# Add default arm processor type
+Add default arm processor type
+
 --- cpuid_arm64.c.orig	2016-09-01 03:58:42 UTC
 +++ cpuid_arm64.c
 @@ -132,6 +132,8 @@ int detect(void)
diff --git a/openblas/patches/patch-cpuid_ia64.c b/openblas/patches/patch-cpuid_ia64.c
index c6d9fbd685..b3bf691a8c 100644
--- a/openblas/patches/patch-cpuid_ia64.c
+++ b/openblas/patches/patch-cpuid_ia64.c
@@ -1,6 +1,7 @@
 $NetBSD$
 
-# FreeBSD does not have sysinfo in base
+FreeBSD does not have sysinfo in base
+
 --- cpuid_ia64.c.orig	2015-10-27 20:44:50 UTC
 +++ cpuid_ia64.c
 @@ -38,7 +38,9 @@
diff --git a/openblas/patches/patch-driver_others_memory.c b/openblas/patches/patch-driver_others_memory.c
index f77bbc85f5..f546b052bb 100644
--- a/openblas/patches/patch-driver_others_memory.c
+++ b/openblas/patches/patch-driver_others_memory.c
@@ -1,8 +1,9 @@
 $NetBSD$
 
-# Check for old GCC
+Check for old GCC
 Passing a priority level to constructor/destructor only works on GCC >= 4.3.0;
 improve the upstream check so that the build works with base GCC.
+
 --- driver/others/memory.c.orig	2016-04-12 19:29:19 UTC
 +++ driver/others/memory.c
 @@ -144,7 +144,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF
diff --git a/openblas/patches/patch-exports+Makefile b/openblas/patches/patch-exports+Makefile
index ce4a144846..190f939a32 100644
--- a/openblas/patches/patch-exports+Makefile
+++ b/openblas/patches/patch-exports+Makefile
@@ -1,6 +1,7 @@
 $NetBSD$
 
-# Improve dynamic lib naming
+Improve dynamic lib naming
+
 --- exports/Makefile.orig	2018-12-31 23:09:59.000000000 +0100
 +++ exports/Makefile	2019-03-22 17:22:50.811953116 +0100
 @@ -160,6 +160,7 @@
diff --git a/openblas/patches/patch-f_check b/openblas/patches/patch-f_check
index 120f7179f5..359e9c0340 100644
--- a/openblas/patches/patch-f_check
+++ b/openblas/patches/patch-f_check
@@ -1,6 +1,7 @@
 $NetBSD$
 
-# Clean up link flags
+Clean up link flags
+
 --- f_check.orig	2015-10-27 20:44:50 UTC
 +++ f_check
 @@ -261,7 +261,7 @@ if ($link ne "") {
diff --git a/openblas/patches/patch-getarch.c b/openblas/patches/patch-getarch.c
index b406b12c59..5cb11f8b77 100644
--- a/openblas/patches/patch-getarch.c
+++ b/openblas/patches/patch-getarch.c
@@ -1,6 +1,7 @@
-@NetBSD@
+$NetBSD$
 
 Do not override our parallel make choice.
+
 --- getarch.c.orig	2018-12-31 23:09:59.000000000 +0100
 +++ getarch.c	2019-03-22 17:24:40.477260427 +0100
 @@ -1236,19 +1236,6 @@
diff --git a/openblas/patches/patch-interface__ztrmv.c b/openblas/patches/patch-interface__ztrmv.c
index 06e02caa9e..108c365004 100644
--- a/openblas/patches/patch-interface__ztrmv.c
+++ b/openblas/patches/patch-interface__ztrmv.c
@@ -1,6 +1,7 @@
 $NetBSD$
 
-# Avoid buffer overflow
+Avoid buffer overflow
+
 --- interface/ztrmv.c.orig	2016-09-01 03:58:42 UTC
 +++ interface/ztrmv.c
 @@ -242,7 +242,7 @@ void CNAME(enum CBLAS_ORDER order, enum
Home | Main Index | Thread Index | Old Index