openblas: remove redundant SUBST and patches work, outdated SUBST

The build now complains when a SUBST does not change things, so those
must go.
This commit is contained in:
Dr. Thomas Orgis 2020-07-17 18:42:03 +02:00
parent 15408037ed
commit f843cb83d4
5 changed files with 10 additions and 344 deletions

View File

@ -48,6 +48,10 @@ TEST_TARGET= tests
MAKE_FLAGS+= CFLAGS=${CFLAGS:Q}
MAKE_FLAGS+= CXXFLAGS=${CXXFLAGS:Q}
MAKE_FLAGS+= FFLAGS=${FFLAGS:Q}
# Also set compilers explicitly, overriding Makefile.rule
MAKE_FLAGS+= CC=${CC:Q}
MAKE_FLAGS+= CXX=${CXX:Q}
MAKE_FLAGS+= FC=${FC:Q}
# You may override the autodetected thread count limit.
# Default is detected from build host.
@ -89,22 +93,9 @@ BENCHMARK_ENV= OMP_NUM_THREADS=${BENCHMARK_MAXTHREADS}
MAKE_FLAGS+= LIBNAMESUFFIX=openmp USE_OPENMP=1 NO_AFFINITY=1
.endif
SUBST_CLASSES+= find
SUBST_STAGE.find= pre-build
SUBST_SED.find+= -e "s+%%FIND%%+${FIND}+"
SUBST_SED.find+= -e "s+%%XARGS%%+${XARGS}+"
SUBST_FILES.find+= ${WRKSRC}/Makefile
SUBST_CLASSES+= compiler
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= pre-build
SUBST_SED.arch+= -e "s+(ARCH)+(ARCH_)+"
SUBST_FILES.arch+= ${WRKSRC}/Makefile.rule
SUBST_FILES.arch+= ${WRKSRC}/Makefile.tail
SUBST_FILES.arch+= ${WRKSRC}/driver/level3/Makefile
SUBST_FILES.arch+= ${WRKSRC}/driver/others/Makefile
@ -119,17 +110,7 @@ SUBST_FILES.arch+= ${WRKSRC}/lapack-netlib/TESTING/MATGEN/Makefile
SUBST_FILES.arch+= ${WRKSRC}/lapack-netlib/LAPACKE/src/Makefile
SUBST_FILES.arch+= ${WRKSRC}/lapack-netlib/LAPACKE/utils/Makefile
SUBST_FILES.arch+= ${WRKSRC}/reference/Makefile
SUBST_CLASSES+= system
SUBST_STAGE.system= pre-build
SUBST_SED.system+= -e "s+(ARCH)+(ARCH_)+"
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+$${CROSS_SUFFIX}+${PREFIX}/bin/+'
SUBST_SED.system+= -e '/Clang.*OpenMP/g'
SUBST_FILES.system+= ${WRKSRC}/Makefile.system
SUBST_FILES.arch+= ${WRKSRC}/Makefile.system
SUBST_CLASSES+= threads
SUBST_STAGE.threads= pre-build

View File

@ -14,14 +14,13 @@ SHA512 (openblas/timing.tgz) = be0abfcfffdf0e118ed7e25a8451639833cf0ad6bb04d101b
Size (openblas/timing.tgz) = 1059485 bytes
SHA1 (patch-Makefile) = 6029076c34765e53a26617fb4bd36b56ba413f1b
SHA1 (patch-Makefile.install) = 08c80677f8040623eaf5277cf92b5f5969fb4a07
SHA1 (patch-Makefile.rule) = 7074d322579d77edcd6cfa938ed862037a777187
SHA1 (patch-Makefile.system) = c8479e170ec0ec657e1c14ee505d0da41cb3d221
SHA1 (patch-Makefile.system) = d9dec776fb0d2919850506f682f3623b68751c90
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-exports+Makefile) = 10d84c9d04bcb8cc88374dabc60016c9c25feb70
SHA1 (patch-exports+Makefile) = 973016eae339d014d9f6f146e1e934793eb76145
SHA1 (patch-f_check) = 9162d6a31f96c6af5aada82f6e78cf0385384215
SHA1 (patch-getarch.c) = 3d0ea5b989c6402d9e2f03a6cc2de848f06ca16d
SHA1 (patch-interface__ztrmv.c) = 6038946f8fb9542e680178ece2bd0d0d5853baad

View File

@ -1,19 +0,0 @@
$NetBSD$
Respect env
--- Makefile.rule.orig 2019-08-11 21:23:27.000000000 +0000
+++ Makefile.rule
@@ -24,10 +24,10 @@ VERSION = 0.3.7
# C compiler including binary type(32bit / 64bit). Default is gcc.
# Don't use Intel Compiler or PGI, it won't generate right codes as I expect.
-# CC = gcc
+CC = gcc
# Fortran compiler. Default is g77.
-# FC = gfortran
+FC = gfortran
# Even you can specify cross compiler. Meanwhile, please set HOSTCC.

View File

@ -1,264 +1,11 @@
$NetBSD$
Fully control the library name via LIBNAMESUFFIX
And the ARCH_ thing.
And a bit of ARCH_
--- Makefile.system.orig 2019-08-11 21:23:27.000000000 +0000
+++ Makefile.system
@@ -15,13 +15,13 @@ ARCH := $(shell uname -m)
endif
# Catch conflicting usage of ARCH in some BSD environments
-ifeq ($(ARCH), amd64)
+ifeq ($(ARCH_), amd64)
override ARCH=x86_64
-else ifeq ($(ARCH), powerpc64)
+else ifeq ($(ARCH_), powerpc64)
override ARCH=power
-else ifeq ($(ARCH), i386)
+else ifeq ($(ARCH_), i386)
override ARCH=x86
-else ifeq ($(ARCH), aarch64)
+else ifeq ($(ARCH_), aarch64)
override ARCH=arm64
endif
@@ -143,7 +143,7 @@ endif
# On x86_64 build getarch with march=native. This is required to detect AVX512 support in getarch.
-ifeq ($(ARCH), x86_64)
+ifeq ($(ARCH_), x86_64)
ifneq ($(C_COMPILER), PGI)
GETARCH_FLAGS += -march=native
endif
@@ -285,6 +285,7 @@ MD5SUM = md5 -r
endif
ifneq (,$(findstring $(OSNAME), FreeBSD OpenBSD DragonFly))
+EXTRALIB += -lm -Wl,-R/stuff/sw/env/system-gcc/pkgsrc/cvs-20190321/lib
MD5SUM = md5 -r
endif
@@ -341,7 +342,7 @@ endif
# Ensure the correct stack alignment on Win32
# http://permalink.gmane.org/gmane.comp.lib.openblas.general/97
-ifeq ($(ARCH), x86)
+ifeq ($(ARCH_), x86)
CCOMMON_OPT += -mincoming-stack-boundary=2
FCOMMON_OPT += -mincoming-stack-boundary=2
endif
@@ -383,8 +384,8 @@ CCOMMON_OPT += -DQUAD_PRECISION
NO_EXPRECISION = 1
endif
-ifneq ($(ARCH), x86)
-ifneq ($(ARCH), x86_64)
+ifneq ($(ARCH_), x86)
+ifneq ($(ARCH_), x86_64)
NO_EXPRECISION = 1
endif
endif
@@ -413,7 +414,7 @@ endif
# Architecture dependent settings
#
-ifeq ($(ARCH), x86)
+ifeq ($(ARCH_), x86)
ifndef BINARY
NO_BINARY_MODE = 1
endif
@@ -439,7 +440,7 @@ endif
endif
endif
-ifeq ($(ARCH), x86_64)
+ifeq ($(ARCH_), x86_64)
ifeq ($(CORE), generic)
NO_EXPRECISION = 1
@@ -503,12 +504,12 @@ endif
ifeq ($(DYNAMIC_ARCH), 1)
-ifeq ($(ARCH), x86)
+ifeq ($(ARCH_), x86)
DYNAMIC_CORE = KATMAI COPPERMINE NORTHWOOD PRESCOTT BANIAS \
CORE2 PENRYN DUNNINGTON NEHALEM ATHLON OPTERON OPTERON_SSE3 BARCELONA BOBCAT ATOM NANO
endif
-ifeq ($(ARCH), x86_64)
+ifeq ($(ARCH_), x86_64)
DYNAMIC_CORE = PRESCOTT CORE2
ifeq ($(DYNAMIC_OLDER), 1)
DYNAMIC_CORE += PENRYN DUNNINGTON
@@ -542,14 +543,14 @@ CCOMMON_OPT += $(XCCOMMON_OPT)
#CCOMMON_OPT += -DDYNAMIC_LIST='$(DYNAMIC_LIST)'
endif
-ifeq ($(ARCH), arm64)
+ifeq ($(ARCH_), arm64)
DYNAMIC_CORE = ARMV8
DYNAMIC_CORE += CORTEXA57
DYNAMIC_CORE += THUNDERX
DYNAMIC_CORE += THUNDERX2T99
endif
-ifeq ($(ARCH), power)
+ifeq ($(ARCH_), power)
DYNAMIC_CORE = POWER6
DYNAMIC_CORE += POWER8
DYNAMIC_CORE += POWER9
@@ -561,7 +562,7 @@ override DYNAMIC_ARCH=
endif
endif
-ifeq ($(ARCH), ia64)
+ifeq ($(ARCH_), ia64)
NO_BINARY_MODE = 1
BINARY_DEFINED = 1
@@ -573,16 +574,16 @@ endif
endif
endif
-ifeq ($(ARCH), $(filter $(ARCH),mips64 mips))
+ifeq ($(ARCH_), $(filter $(ARCH_),mips64 mips))
NO_BINARY_MODE = 1
endif
-ifeq ($(ARCH), alpha)
+ifeq ($(ARCH_), alpha)
NO_BINARY_MODE = 1
BINARY_DEFINED = 1
endif
-ifeq ($(ARCH), arm)
+ifeq ($(ARCH_), arm)
NO_BINARY_MODE = 1
BINARY_DEFINED = 1
@@ -604,7 +605,7 @@ endif
endif
endif
-ifeq ($(ARCH), arm64)
+ifeq ($(ARCH_), arm64)
NO_BINARY_MODE = 1
BINARY_DEFINED = 1
endif
@@ -630,14 +631,14 @@ endif
ifdef NO_BINARY_MODE
-ifeq ($(ARCH), $(filter $(ARCH),mips64))
+ifeq ($(ARCH_), $(filter $(ARCH_),mips64))
ifdef BINARY64
CCOMMON_OPT += -mabi=64
else
CCOMMON_OPT += -mabi=n32
endif
BINARY_DEFINED = 1
-else ifeq ($(ARCH), $(filter $(ARCH),mips))
+else ifeq ($(ARCH_), $(filter $(ARCH_),mips))
CCOMMON_OPT += -mabi=32
BINARY_DEFINED = 1
endif
@@ -772,13 +773,13 @@ ifneq ($(NO_LAPACK), 1)
EXTRALIB += -lgfortran
endif
ifdef NO_BINARY_MODE
-ifeq ($(ARCH), $(filter $(ARCH),mips64))
+ifeq ($(ARCH_), $(filter $(ARCH_),mips64))
ifdef BINARY64
FCOMMON_OPT += -mabi=64
else
FCOMMON_OPT += -mabi=n32
endif
-else ifeq ($(ARCH), $(filter $(ARCH),mips))
+else ifeq ($(ARCH_), $(filter $(ARCH_),mips))
FCOMMON_OPT += -mabi=32
endif
else
@@ -882,7 +883,7 @@ endif
endif
endif
-ifeq ($(ARCH), $(filter $(ARCH),mips64 mips))
+ifeq ($(ARCH_), $(filter $(ARCH_),mips64 mips))
ifndef BINARY64
FCOMMON_OPT += -n32
else
@@ -912,7 +913,7 @@ endif
ifeq ($(C_COMPILER), OPEN64)
-ifeq ($(ARCH), $(filter $(ARCH),mips64 mips))
+ifeq ($(ARCH_), $(filter $(ARCH_),mips64 mips))
ifndef BINARY64
CCOMMON_OPT += -n32
else
@@ -938,7 +939,7 @@ endif
ifeq ($(C_COMPILER), SUN)
CCOMMON_OPT += -w
-ifeq ($(ARCH), x86)
+ifeq ($(ARCH_), x86)
CCOMMON_OPT += -m32
else
FCOMMON_OPT += -m64
@@ -947,7 +948,7 @@ endif
ifeq ($(F_COMPILER), SUN)
CCOMMON_OPT += -DF_INTERFACE_SUN
-ifeq ($(ARCH), x86)
+ifeq ($(ARCH_), x86)
FCOMMON_OPT += -m32
else
FCOMMON_OPT += -m64
@@ -1008,7 +1009,7 @@ ifeq ($(NO_AVX), 1)
CCOMMON_OPT += -DNO_AVX
endif
-ifeq ($(ARCH), x86)
+ifeq ($(ARCH_), x86)
CCOMMON_OPT += -DNO_AVX
endif
@@ -1023,7 +1024,7 @@ endif
ifdef SMP
CCOMMON_OPT += -DSMP_SERVER
-ifeq ($(ARCH), mips64)
+ifeq ($(ARCH_), mips64)
ifneq ($(CORE), LOONGSON3B)
USE_SIMPLE_THREADED_LEVEL3 = 1
endif
@@ -1098,9 +1099,9 @@ else
LIBPREFIX = lib$(LIBNAMEBASE)
endif
-KERNELDIR = $(TOPDIR)/kernel/$(ARCH)
+KERNELDIR = $(TOPDIR)/kernel/$(ARCH_)
-include $(TOPDIR)/Makefile.$(ARCH)
+include $(TOPDIR)/Makefile.$(ARCH_)
CCOMMON_OPT += -DASMNAME=$(FU)$(*F) -DASMFNAME=$(FU)$(*F)$(BU) -DNAME=$(*F)$(BU) -DCNAME=$(*F) -DCHAR_NAME=\"$(*F)$(BU)\" -DCHAR_CNAME=\"$(*F)\"
@@ -1116,8 +1117,8 @@ ifneq ($(OSNAME), Linux)
NO_AFFINITY = 1
endif
-ifneq ($(ARCH), x86_64)
-ifneq ($(ARCH), x86)
+ifneq ($(ARCH_), x86_64)
+ifneq ($(ARCH_), x86)
ifneq ($(CORE), LOONGSON3B)
NO_AFFINITY = 1
endif
@@ -1242,31 +1243,15 @@ ifndef LIBSUFFIX
@@ -1242,31 +1242,15 @@ ifndef LIBSUFFIX
LIBSUFFIX = a
endif
@ -294,7 +41,7 @@ And the ARCH_ thing.
endif
LIBDYNNAME = $(LIBNAME:.$(LIBSUFFIX)=.dylib)
LIBDEFNAME = $(LIBNAME:.$(LIBSUFFIX)=.def)
@@ -1297,7 +1282,7 @@ LIB_COMPONENTS = CBLAS
@@ -1297,7 +1281,7 @@ LIB_COMPONENTS = CBLAS
endif
export OSNAME

View File

@ -4,19 +4,6 @@ Improve dynamic lib naming
--- exports/Makefile.orig 2019-08-11 21:23:27.000000000 +0000
+++ exports/Makefile
@@ -100,10 +100,10 @@ dll : ../$(LIBDLLNAME)
-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive $(FEXTRALIB) $(EXTRALIB)
$(LIBPREFIX).def : gensymbol
- perl ./gensymbol win2k $(ARCH) dummy $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > $(@F)
+ perl ./gensymbol win2k $(ARCH_) dummy $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > $(@F)
libgoto_hpl.def : gensymbol
- perl ./gensymbol win2khpl $(ARCH) dummy $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > $(@F)
+ perl ./gensymbol win2khpl $(ARCH_) dummy $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > $(@F)
ifeq ($(OSNAME), Darwin)
INTERNALNAME = $(LIBPREFIX).$(MAJOR_VERSION).dylib
@@ -173,6 +173,7 @@ endif
#http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD OpenBSD NetBSD DragonFly))
@ -33,32 +20,3 @@ Improve dynamic lib naming
$(FEXTRALIB) $(EXTRALIB)
$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
rm -f linktest
@@ -234,23 +236,23 @@ static : ../$(LIBNAME)
rm -f goto.$(SUFFIX)
osx.def : gensymbol ../Makefile.system ../getarch.c
- perl ./gensymbol osx $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > $(@F)
+ perl ./gensymbol osx $(ARCH_) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > $(@F)
aix.def : gensymbol ../Makefile.system ../getarch.c
- perl ./gensymbol aix $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > $(@F)
+ perl ./gensymbol aix $(ARCH_) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > $(@F)
objcopy.def : gensymbol ../Makefile.system ../getarch.c
- perl ./gensymbol objcopy $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > $(@F)
+ perl ./gensymbol objcopy $(ARCH_) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > $(@F)
objconv.def : gensymbol ../Makefile.system ../getarch.c
- perl ./gensymbol objconv $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > $(@F)
+ perl ./gensymbol objconv $(ARCH_) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > $(@F)
test : linktest.c
$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) -lm && echo OK.
rm -f linktest
linktest.c : gensymbol ../Makefile.system ../getarch.c
- perl ./gensymbol linktest $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > linktest.c
+ perl ./gensymbol linktest $(ARCH_) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > linktest.c
clean ::
@rm -f *.def *.dylib __.SYMDEF* *.renamed