pkgsrc-WIP-changes archive

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

openblas*: remove here, imported



Module Name:	pkgsrc-wip
Committed By:	Dr. Thomas Orgis <thomas.orgis%uni-hamburg.de@localhost>
Pushed By:	thor
Date:		Tue Apr 20 23:55:54 2021 +0200
Changeset:	8ef7394a3907ce9d041054383ba98a7082764860

Modified Files:
	Makefile
Removed Files:
	openblas/DESCR
	openblas/Makefile
	openblas/Makefile.common
	openblas/PLIST
	openblas/TODO
	openblas/buildlink3.mk
	openblas/distinfo
	openblas/options.mk
	openblas/patches/patch-Makefile
	openblas/patches/patch-Makefile.install
	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-exports+Makefile
	openblas/patches/patch-f_check
	openblas/patches/patch-getarch.c
	openblas/patches/patch-interface__ztrmv.c
	openblas/version.mk
	openblas_openmp/DESCR
	openblas_openmp/Makefile
	openblas_openmp/buildlink3.mk
	openblas_pthread/DESCR
	openblas_pthread/Makefile
	openblas_pthread/buildlink3.mk

Log Message:
openblas*: remove here, imported

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

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

diffstat:
 Makefile                                  |   3 -
 openblas/DESCR                            |   5 --
 openblas/Makefile                         |   7 --
 openblas/Makefile.common                  | 133 ------------------------------
 openblas/PLIST                            |   9 --
 openblas/TODO                             |   3 -
 openblas/buildlink3.mk                    |  12 ---
 openblas/distinfo                         |  26 ------
 openblas/options.mk                       |  18 ----
 openblas/patches/patch-Makefile           |  63 --------------
 openblas/patches/patch-Makefile.install   |  43 ----------
 openblas/patches/patch-Makefile.system    |  52 ------------
 openblas/patches/patch-c_check            |  15 ----
 openblas/patches/patch-common__arm.h      |  20 -----
 openblas/patches/patch-cpuid__arm.c       |  16 ----
 openblas/patches/patch-cpuid__arm64.c     |  15 ----
 openblas/patches/patch-cpuid_ia64.c       |  16 ----
 openblas/patches/patch-exports+Makefile   |  14 ----
 openblas/patches/patch-f_check            |  24 ------
 openblas/patches/patch-getarch.c          |  26 ------
 openblas/patches/patch-interface__ztrmv.c |  15 ----
 openblas/version.mk                       |   5 --
 openblas_openmp/DESCR                     |   5 --
 openblas_openmp/Makefile                  |   7 --
 openblas_openmp/buildlink3.mk             |  12 ---
 openblas_pthread/DESCR                    |   5 --
 openblas_pthread/Makefile                 |   7 --
 openblas_pthread/buildlink3.mk            |  12 ---
 28 files changed, 588 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 733c4e39a5..f14a2bafee 100644
--- a/Makefile
+++ b/Makefile
@@ -2613,9 +2613,6 @@ SUBDIR+=	openafs-git
 SUBDIR+=	openaxiom-svn
 SUBDIR+=	openbgpd
 SUBDIR+=	openbgpd-as4byte
-SUBDIR+=	openblas
-SUBDIR+=	openblas_openmp
-SUBDIR+=	openblas_pthread
 SUBDIR+=	openbox-themes-extra
 SUBDIR+=	openbsc
 SUBDIR+=	openbsd-input-usbtablet
diff --git a/openblas/DESCR b/openblas/DESCR
deleted file mode 100644
index 5f86d758e4..0000000000
--- a/openblas/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.
-OpenBLAS is an open source project supported by
-Lab of Parallel Software and Computational Science, ISCAS.
-
-This package builds the serial library.
diff --git a/openblas/Makefile b/openblas/Makefile
deleted file mode 100644
index 1b8c82faa3..0000000000
--- a/openblas/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD$
-
-MAINTAINER=	thomas.orgis%uni-hamburg.de@localhost
-
-OPENBLAS_VARIANT= openblas
-.include "../../wip/openblas/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/openblas/Makefile.common b/openblas/Makefile.common
deleted file mode 100644
index 78e7312eb0..0000000000
--- a/openblas/Makefile.common
+++ /dev/null
@@ -1,133 +0,0 @@
-# $NetBSD$
-#
-# 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.
-
-DISTNAME=	OpenBLAS-${OPENBLAS_VERSION}
-PKGNAME=	${OPENBLAS_VARIANT}-${OPENBLAS_VERSION}
-DIST_SUBDIR=	openblas-${OPENBLAS_VERSION}
-CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_GITHUB:=xianyi/} \
-		http://www.netlib.org/lapack/timing/
-DISTFILES=	${DISTNAME}.tar.gz ${LARGE_FILE} ${TIMING_FILE}
-LARGE_FILE=	large.tgz
-TIMING_FILE=	timing.tgz
-GITHUB_PROJECT=	OpenBLAS
-GITHUB_TAG=	v${OPENBLAS_VERSION}
-
-DISTINFO_FILE=	${.CURDIR}/../../wip/openblas/distinfo
-PATCHDIR=	${.CURDIR}/../../wip/openblas/patches
-
-HOMEPAGE=	https://github.com/xianyi/OpenBLAS
-COMMENT=	Optimized BLAS library based on GotoBLAS2
-LICENSE=	modified-bsd
-
-# Darwin has a .so/.dylib PLIST issue
-# Untested on other platforms
-ONLY_FOR_PLATFORM=	Linux-*-* NetBSD-*-*
-
-USE_LANGUAGES=	c fortran
-USE_TOOLS+=	gmake perl:build
-
-NO_CONFIGURE=	yes
-
-TEST_TARGET=	tests
-
-# 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, 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}
-.endif
-BENCHMARK_MAXTHREADS?=	8
-
-.if ${MACHINE_ARCH:M*64} == ""
-MAKE_FLAGS+=		BINARY32=1
-.else
-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
-
-# Separate headers and cmake stuff.
-MAKE_FLAGS+=	OPENBLAS_INCLUDE_DIR=${PREFIX}/include/${OPENBLAS_VARIANT}
-MAKE_FLAGS+=	OPENBLAS_CMAKE_DIR=${PREFIX}/lib/cmake/${OPENBLAS_VARIANT}
-
-# TODO: Set INTERFACE64=1 with additional OPENBLAS_VARIANTs.
-# Need to settle on a convention for SYMBOLSUFFIX first, see
-# https://github.com/xianyi/OpenBLAS/issues/646 .
-.if ${OPENBLAS_VARIANT} == openblas
-MAKE_FLAGS+=	USE_OPENMP=0 USE_THREAD=0 USE_LOCKING=1
-BENCHMARK_ENV=	USE_SIMPLE_THREADED_LEVEL3=1
-.elif ${OPENBLAS_VARIANT} == openblas_pthread
-BENCHMARK_ENV=	OPENBLAS_NUM_THREADS=${BENCHMARK_MAXTHREADS}
-MAKE_FLAGS+=	LIBNAMESUFFIX=pthread USE_OPENMP=0 USE_THREAD=1
-.elif ${OPENBLAS_VARIANT} == openblas_openmp
-BENCHMARK_ENV=	OMP_NUM_THREADS=${BENCHMARK_MAXTHREADS}
-MAKE_FLAGS+=	LIBNAMESUFFIX=openmp USE_OPENMP=1 NO_AFFINITY=1
-.endif
-
-SUBST_CLASSES+=		arch
-SUBST_STAGE.arch=	pre-build
-SUBST_SED.arch+=	-e "s+(ARCH)+(ARCH_)+g"
-SUBST_FILES.arch+=	Makefile.tail
-SUBST_FILES.arch+=	driver/level3/Makefile
-SUBST_FILES.arch+=	driver/others/Makefile
-SUBST_FILES.arch+=	exports/Makefile
-SUBST_FILES.arch+=	interface/Makefile
-SUBST_FILES.arch+=	kernel/Makefile
-SUBST_FILES.arch+=	kernel/Makefile.L3
-SUBST_FILES.arch+=	lapack/laswp/Makefile
-SUBST_FILES.arch+=	reference/Makefile
-SUBST_FILES.arch+=	Makefile.system
-
-SUBST_CLASSES+=		threads
-SUBST_STAGE.threads=	pre-build
-SUBST_SED.threads+=	-e "s+OPENBLAS_NUM_THREADS+OMP_NUM_THREADS+g"
-SUBST_FILES.threads+=	test/Makefile
-SUBST_FILES.threads+=	ctest/Makefile
-
-# Fix up pkgconfig file installation.
-SUBST_CLASSES+=		pc
-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
-
-PLIST_SRC=	${.CURDIR}/../../wip/openblas/PLIST
-PLIST_SUBST+=	OPENBLAS_VARIANT=${OPENBLAS_VARIANT}
-
-post-extract:
-	(cd ${DISTDIR}/${DIST_SUBDIR} && \
-		${CP} ${LARGE_FILE} ${TIMING_FILE} ${WRKSRC})
-
-# This builds some benchmark programs you can call from ${WRKSRC} afterwards.
-# ThOr: I do not like that. Can we rather rename the benchmark files
-# to be unique?
-.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})
-
-.include "../../wip/openblas/version.mk"
-
-.include "options.mk"
diff --git a/openblas/PLIST b/openblas/PLIST
deleted file mode 100644
index 7c08aaaf3e..0000000000
--- a/openblas/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD$
-lib/lib${OPENBLAS_VARIANT}.a
-lib/lib${OPENBLAS_VARIANT}.so
-lib/lib${OPENBLAS_VARIANT}.so.0
-lib/pkgconfig/${OPENBLAS_VARIANT}.pc
-lib/cmake/${OPENBLAS_VARIANT}/OpenBLASConfig.cmake
-lib/cmake/${OPENBLAS_VARIANT}/OpenBLASConfigVersion.cmake
-include/${OPENBLAS_VARIANT}/openblas_config.h
-include/${OPENBLAS_VARIANT}/f77blas.h
diff --git a/openblas/TODO b/openblas/TODO
deleted file mode 100644
index 4c5916b2e3..0000000000
--- a/openblas/TODO
+++ /dev/null
@@ -1,3 +0,0 @@
-Implement INTERFACE64, OPENMP options
-Disable DYNAMIC_ARCH if not package-building
-Implement AVX, AVX2 for x86
diff --git a/openblas/buildlink3.mk b/openblas/buildlink3.mk
deleted file mode 100644
index 8c37429b0c..0000000000
--- a/openblas/buildlink3.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+=	openblas
-
-.if !defined(OPENBLAS_BUILDLINK3_MK)
-OPENBLAS_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.openblas+=	openblas>=0.3.5
-BUILDLINK_PKGSRCDIR.openblas?=		../../wip/openblas
-.endif	# OPENBLAS_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-openblas
diff --git a/openblas/distinfo b/openblas/distinfo
deleted file mode 100644
index f762b22305..0000000000
--- a/openblas/distinfo
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-SHA1 (openblas-0.3.10/OpenBLAS-0.3.10.tar.gz) = cbe3fdd0e6ee235debc611d76976dac62f3ddc1c
-RMD160 (openblas-0.3.10/OpenBLAS-0.3.10.tar.gz) = 031ed30a7934655dcbeb26d9d71f8e9ec3094a55
-SHA512 (openblas-0.3.10/OpenBLAS-0.3.10.tar.gz) = 64a5f983b2f6e02cdb6e0f14433498cc5daa1ccfb49246f7a2dcd38f9982fa608f2abea069fe0e35012af8c1441c43d1f6418eaccd40795f5002fed1c36ce05d
-Size (openblas-0.3.10/OpenBLAS-0.3.10.tar.gz) = 12246979 bytes
-SHA1 (openblas-0.3.10/large.tgz) = a689e5b180595b40c5719b0f358b31b15b57a2db
-RMD160 (openblas-0.3.10/large.tgz) = 8010ff4002ef42cf22a9ee9345011d68fc27d855
-SHA512 (openblas-0.3.10/large.tgz) = e24db2b8a4253ccff9ca196815901c1fefd55e882f4fe1085715ac84b8f318e1842a91072130c17fdd144344ffc80233a77500da9349acb54e504b3935825965
-Size (openblas-0.3.10/large.tgz) = 2595 bytes
-SHA1 (openblas-0.3.10/timing.tgz) = fd47fc3f26d142a791df51e4a422a49662507252
-RMD160 (openblas-0.3.10/timing.tgz) = f0fe220e7ab611d4db8d8cab960361955e2ab093
-SHA512 (openblas-0.3.10/timing.tgz) = be0abfcfffdf0e118ed7e25a8451639833cf0ad6bb04d101bbe194c16f656b6ce509b2f76acf4ad626d1fb5b126bd5498cfea262f2946c2d077751112a2906af
-Size (openblas-0.3.10/timing.tgz) = 1059485 bytes
-SHA1 (patch-Makefile) = 91690ebbbe3acc0c4339120c752dfa22952db9eb
-SHA1 (patch-Makefile.install) = 8d4320114f66dd6fabaec94c9710ebc5b7b49d39
-SHA1 (patch-Makefile.system) = 4a0267b3181230cae4575041070fc30186355e0a
-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) = 03f5b3cc41d215a961bb4d1dd197d72f8ddaadbc
-SHA1 (patch-f_check) = 9162d6a31f96c6af5aada82f6e78cf0385384215
-SHA1 (patch-getarch.c) = 0cf098b7203586206df95b24d1e95b0b5b9fd500
-SHA1 (patch-interface__ztrmv.c) = 6038946f8fb9542e680178ece2bd0d0d5853baad
diff --git a/openblas/options.mk b/openblas/options.mk
deleted file mode 100644
index f0d02370f0..0000000000
--- a/openblas/options.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD$
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.openblas
-# Auto-detect CPU features at runtime or use static features from build host
-PKG_SUPPORTED_OPTIONS=	dynamic-arch
-PKG_SUGGESTED_OPTIONS=	dynamic-arch
-
-.include "../../mk/bsd.prefs.mk"
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mdynamic-arch)
-MAKE_FLAGS+=	DYNAMIC_ARCH=1
-.else
-MAKE_FLAGS+=	DYNAMIC_ARCH=0
-.endif
-
-# Other options create variants of the library, not configurations of one.
-# Especially INTERFACE64, which changes the API!
diff --git a/openblas/patches/patch-Makefile b/openblas/patches/patch-Makefile
deleted file mode 100644
index 47ee4e588b..0000000000
--- a/openblas/patches/patch-Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD$
-
-Remove special library names.
-
---- Makefile.orig	2020-06-14 20:03:04.000000000 +0000
-+++ Makefile
-@@ -115,7 +115,6 @@ ifneq ($(NO_SHARED), 1)
- ifeq ($(OSNAME), $(filter $(OSNAME),Linux SunOS Android Haiku FreeBSD DragonFly))
- 	@$(MAKE) -C exports so
- 	@ln -fs $(LIBSONAME) $(LIBPREFIX).so
--	@ln -fs $(LIBSONAME) $(LIBPREFIX).so.$(MAJOR_VERSION)
- endif
- ifeq ($(OSNAME), $(filter $(OSNAME),OpenBSD NetBSD))
- 	@$(MAKE) -C exports so
-@@ -123,8 +122,6 @@ ifeq ($(OSNAME), $(filter $(OSNAME),Open
- endif
- ifeq ($(OSNAME), Darwin)
- 	@$(MAKE) -C exports dyn
--	@ln -fs $(LIBDYNNAME) $(LIBPREFIX).dylib
--	@ln -fs $(LIBDYNNAME) $(LIBPREFIX).$(MAJOR_VERSION).dylib
- endif
- ifeq ($(OSNAME), WINNT)
- 	@$(MAKE) -C exports dll
-@@ -161,7 +158,6 @@ ifeq ($(NO_SHARED), 1)
- 	$(error OpenBLAS: neither static nor shared are enabled.)
- endif
- endif
--	@-ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
- 	@for d in $(SUBDIRS) ; \
- 	do if test -d $$d; then \
- 	  $(MAKE) -C $$d $(@F) || exit 1 ; \
-@@ -195,7 +191,6 @@ endif
- prof : prof_blas prof_lapack
- 
- prof_blas :
--	ln -fs $(LIBNAME_P) $(LIBPREFIX)_p.$(LIBSUFFIX)
- 	for d in $(SUBDIRS) ; \
- 	do if test -d $$d; then \
- 	  $(MAKE) -C $$d prof || exit 1 ; \
-@@ -206,7 +201,6 @@ ifeq ($(DYNAMIC_ARCH), 1)
- endif
- 
- blas :
--	ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
- 	for d in $(BLASDIRS) ; \
- 	do if test -d $$d; then \
- 	  $(MAKE) -C $$d libs || exit 1 ; \
-@@ -214,7 +208,6 @@ blas :
- 	done
- 
- hpl :
--	ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
- 	for d in $(BLASDIRS) ../laswp exports ; \
- 	do if test -d $$d; then \
- 	  $(MAKE) -C $$d $(@F) || exit 1 ; \
-@@ -228,7 +221,6 @@ ifeq ($(DYNAMIC_ARCH), 1)
- endif
- 
- hpl_p :
--	ln -fs $(LIBNAME_P) $(LIBPREFIX)_p.$(LIBSUFFIX)
- 	for d in $(SUBDIRS) ../laswp exports ; \
- 	do if test -d $$d; then \
- 	  $(MAKE) -C $$d $(@F) || exit 1 ; \
diff --git a/openblas/patches/patch-Makefile.install b/openblas/patches/patch-Makefile.install
deleted file mode 100644
index 2bd6ec8127..0000000000
--- a/openblas/patches/patch-Makefile.install
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD$
-
-Second part of removing the special library names.
-
---- Makefile.install.orig	2020-06-14 20:03:04.000000000 +0000
-+++ Makefile.install
-@@ -62,8 +62,6 @@ endif
- ifneq ($(NO_STATIC),1)
- 	@echo Copying the static library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
- 	@install -pm644 $(LIBNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
--	@cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
--	ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
- endif
- #for install shared library
- ifneq ($(NO_SHARED),1)
-@@ -71,8 +69,7 @@ ifneq ($(NO_SHARED),1)
- ifeq ($(OSNAME), $(filter $(OSNAME),Linux SunOS Android Haiku FreeBSD DragonFly))
- 	@install -pm755 $(LIBSONAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
- 	@cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
--	ln -fs $(LIBSONAME) $(LIBPREFIX).so ; \
--	ln -fs $(LIBSONAME) $(LIBPREFIX).so.$(MAJOR_VERSION)
-+	ln -fs $(LIBSONAME) $(LIBPREFIX).so
- endif
- 
- ifeq ($(OSNAME), $(filter $(OSNAME),OpenBSD NetBSD))
-@@ -112,16 +109,13 @@ endif
- ifneq ($(NO_STATIC),1)
- 	@echo Copying the static library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
- 	@installbsd -c -m 644 $(LIBNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
--	@cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
--	ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
- endif
- #for install shared library
- ifneq ($(NO_SHARED),1)
- 	@echo Copying the shared library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
- 	@installbsd -c -m 755 $(LIBSONAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
- 	@cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
--	ln -fs $(LIBSONAME) $(LIBPREFIX).so ; \
--	ln -fs $(LIBSONAME) $(LIBPREFIX).so.$(MAJOR_VERSION)
-+	ln -fs $(LIBSONAME) $(LIBPREFIX).so
- endif
- 
- endif
diff --git a/openblas/patches/patch-Makefile.system b/openblas/patches/patch-Makefile.system
deleted file mode 100644
index 2203fd6508..0000000000
--- a/openblas/patches/patch-Makefile.system
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD$
-
-Fully control the library name via LIBNAMESUFFIX
-And a bit of ARCH_
-
---- Makefile.system.orig	2020-06-14 20:03:04.000000000 +0000
-+++ Makefile.system
-@@ -1326,31 +1326,15 @@ ifndef LIBSUFFIX
- LIBSUFFIX = a
- endif
- 
--ifneq ($(DYNAMIC_ARCH), 1)
--ifndef SMP
--LIBNAME		= $(LIBPREFIX)_$(LIBCORE)$(REVISION).$(LIBSUFFIX)
--LIBNAME_P	= $(LIBPREFIX)_$(LIBCORE)$(REVISION)_p.$(LIBSUFFIX)
--else
--LIBNAME		= $(LIBPREFIX)_$(LIBCORE)p$(REVISION).$(LIBSUFFIX)
--LIBNAME_P	= $(LIBPREFIX)_$(LIBCORE)p$(REVISION)_p.$(LIBSUFFIX)
--endif
--else
--ifndef SMP
--LIBNAME		= $(LIBPREFIX)$(REVISION).$(LIBSUFFIX)
--LIBNAME_P	= $(LIBPREFIX)$(REVISION)_p.$(LIBSUFFIX)
--else
--LIBNAME		= $(LIBPREFIX)p$(REVISION).$(LIBSUFFIX)
--LIBNAME_P	= $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX)
--endif
--endif
--
-+LIBNAME		= $(LIBPREFIX).$(LIBSUFFIX)
-+LIBNAME_P	= $(LIBPREFIX)_p.$(LIBSUFFIX)
- 
- LIBDLLNAME   = $(LIBPREFIX).dll
- IMPLIBNAME   = lib$(LIBNAMEBASE).dll.a
- ifneq ($(OSNAME), AIX)
--LIBSONAME    = $(LIBNAME:.$(LIBSUFFIX)=.so)
-+LIBSONAME    = $(LIBNAME:.$(LIBSUFFIX)=.so).$(MAJOR_VERSION)
- else
--LIBSONAME    = $(LIBNAME:.$(LIBSUFFIX)=.a)
-+LIBSONAME    = $(LIBNAME:.$(LIBSUFFIX)=.a).$(MAJOR_VERSION)
- endif
- LIBDYNNAME   = $(LIBNAME:.$(LIBSUFFIX)=.dylib)
- LIBDEFNAME   = $(LIBNAME:.$(LIBSUFFIX)=.def)
-@@ -1381,7 +1365,7 @@ LIB_COMPONENTS = CBLAS
- endif
- 
- export OSNAME
--export ARCH
-+export ARCH_
- export CORE
- export LIBCORE
- export __BYTE_ORDER__
diff --git a/openblas/patches/patch-c_check b/openblas/patches/patch-c_check
deleted file mode 100644
index 65267308d1..0000000000
--- a/openblas/patches/patch-c_check
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-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
- # print $data, "\n";
- 
- print MAKEFILE "OSNAME=$os\n";
--print MAKEFILE "ARCH=$architecture\n";
-+print MAKEFILE "ARCH_=$architecture\n";
- print MAKEFILE "C_COMPILER=$compiler\n";
- print MAKEFILE "BINARY32=\n" if $binformat ne bin32;
- print MAKEFILE "BINARY64=\n" if $binformat ne bin64;
diff --git a/openblas/patches/patch-common__arm.h b/openblas/patches/patch-common__arm.h
deleted file mode 100644
index 1cee5a53a3..0000000000
--- a/openblas/patches/patch-common__arm.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-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
- 
- #endif
- 
-+/* Translate pre-UAL asm to UAL equivalents */
-+#if defined(__clang__)
-+#define fnmacs vmls.f32
-+#define fnmacd vmls.f64
-+#define fnmuls vnmul.f32
-+#define fnmuld vnmul.f64
-+#endif
- 
- #ifndef F_INTERFACE
- #define REALNAME ASMNAME
diff --git a/openblas/patches/patch-cpuid__arm.c b/openblas/patches/patch-cpuid__arm.c
deleted file mode 100644
index d1be0d3afe..0000000000
--- a/openblas/patches/patch-cpuid__arm.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-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)
- 	  }
- 
- 	}
--
-+#else
-+	return CPU_ARMV6;
- #endif
- 
- 	return CPU_UNKNOWN;
diff --git a/openblas/patches/patch-cpuid__arm64.c b/openblas/patches/patch-cpuid__arm64.c
deleted file mode 100644
index 20bb64804c..0000000000
--- a/openblas/patches/patch-cpuid__arm64.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-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)
- 
- 
- 	}
-+#else
-+	return CPU_ARMV8;
- #endif
- 
- 	return CPU_UNKNOWN;
diff --git a/openblas/patches/patch-cpuid_ia64.c b/openblas/patches/patch-cpuid_ia64.c
deleted file mode 100644
index b3bf691a8c..0000000000
--- a/openblas/patches/patch-cpuid_ia64.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-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 @@
- 
- #include <stdio.h>
- #include <string.h>
-+#ifdef linux
- #include <sys/sysinfo.h>
-+#endif
- #include "cpuid.h"
- 
- #ifdef __ECC
diff --git a/openblas/patches/patch-exports+Makefile b/openblas/patches/patch-exports+Makefile
deleted file mode 100644
index ccc010e7c2..0000000000
--- a/openblas/patches/patch-exports+Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Improve dynamic lib naming
-
---- exports/Makefile.orig	2020-06-14 20:03:04.000000000 +0000
-+++ exports/Makefile
-@@ -192,6 +192,7 @@ else
- endif
- 	$(CC) $(CFLAGS) $(LDFLAGS)  -shared -o ../$(LIBSONAME) \
- 	-Wl,--whole-archive $< -Wl,--no-whole-archive \
-+	-Wl,-soname,$(LIBPREFIX).so.$(MAJOR_VERSION) \
- 	$(FEXTRALIB) $(EXTRALIB)
- 	$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
- 	rm -f linktest
diff --git a/openblas/patches/patch-f_check b/openblas/patches/patch-f_check
deleted file mode 100644
index 359e9c0340..0000000000
--- a/openblas/patches/patch-f_check
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-Clean up link flags
-
---- f_check.orig	2015-10-27 20:44:50 UTC
-+++ f_check
-@@ -261,7 +261,7 @@ if ($link ne "") {
- 
-     foreach $flags (@flags) {
- 	if (
--	    ($flags =~ /^\-L/)
-+	    ($flags =~ /^\-L\S/)
- 	    && ($flags !~ /^-LIST:/)
- 	    && ($flags !~ /^-LANG:/)
- 	    ) {
-@@ -292,7 +292,7 @@ if ($link ne "") {
- 	}
- 
- 	if (
--	    ($flags =~ /^\-l/)
-+	    ($flags =~ /^\-l\S/)
- 	    && ($flags !~ /gfortranbegin/)
- 	    && ($flags !~ /frtbegin/)
- 	    && ($flags !~ /pathfstart/)
diff --git a/openblas/patches/patch-getarch.c b/openblas/patches/patch-getarch.c
deleted file mode 100644
index 9773d7b77e..0000000000
--- a/openblas/patches/patch-getarch.c
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-Do not override our parallel make choice.
-
---- getarch.c.orig	2020-11-11 22:35:05.756907595 +0000
-+++ getarch.c
-@@ -1369,19 +1369,6 @@ printf("__BYTE_ORDER__=__ORDER_BIG_ENDIA
- printf("ELF_VERSION=2\n");
- #endif
- 
--#ifdef MAKE_NB_JOBS
--  #if MAKE_NB_JOBS > 0
--    printf("MAKE += -j %d\n", MAKE_NB_JOBS);
--  #else
--    // Let make use parent -j argument or -j1 if there
--    // is no make parent
--  #endif
--#elif NO_PARALLEL_MAKE==1
--    printf("MAKE += -j 1\n");
--#else
--    printf("MAKE += -j %d\n", get_num_cores());
--#endif
--
-     break;
- 
-   case '1' : /* For config.h */
diff --git a/openblas/patches/patch-interface__ztrmv.c b/openblas/patches/patch-interface__ztrmv.c
deleted file mode 100644
index 108c365004..0000000000
--- a/openblas/patches/patch-interface__ztrmv.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-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 
-   else
- #endif
-   {
--    buffer_size = ((n - 1) / DTB_ENTRIES) * 2 * DTB_ENTRIES + 32 / sizeof(FLOAT);
-+    buffer_size = (((n - 1) / DTB_ENTRIES) * 2 * DTB_ENTRIES + 32 / sizeof(FLOAT)) + 8;
-     // It seems to be required for some K8 or Barcelona CPU
-     buffer_size += 8;
-     if(incx != 1)
diff --git a/openblas/version.mk b/openblas/version.mk
deleted file mode 100644
index 92d1baaf1f..0000000000
--- a/openblas/version.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD$
-
-# Intentionally not 0.3.12, as that has build issues
-# on Ivy Bridge. 0.3.13 should be fine.
-OPENBLAS_VERSION=	0.3.10
diff --git a/openblas_openmp/DESCR b/openblas_openmp/DESCR
deleted file mode 100644
index a9b009e75e..0000000000
--- a/openblas_openmp/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.
-OpenBLAS is an open source project supported by
-Lab of Parallel Software and Computational Science, ISCAS.
-
-This package builds the parallel library using OpenMP.
diff --git a/openblas_openmp/Makefile b/openblas_openmp/Makefile
deleted file mode 100644
index b017993483..0000000000
--- a/openblas_openmp/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD$
-
-MAINTAINER=	thomas.orgis%uni-hamburg.de@localhost
-
-OPENBLAS_VARIANT= openblas_openmp
-.include "../../wip/openblas/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/openblas_openmp/buildlink3.mk b/openblas_openmp/buildlink3.mk
deleted file mode 100644
index acb4f13b76..0000000000
--- a/openblas_openmp/buildlink3.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+=	openblas_openmp
-
-.if !defined(OPENBLAS_OPENMP_BUILDLINK3_MK)
-OPENBLAS_OPENMP_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.openblas_openmp+=	openblas_openmp>=0.3.5
-BUILDLINK_PKGSRCDIR.openblas_openmp?=	../../wip/openblas_openmp
-.endif	# OPENBLAS_OPENMP_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-openblas_openmp
diff --git a/openblas_pthread/DESCR b/openblas_pthread/DESCR
deleted file mode 100644
index 7382cc614a..0000000000
--- a/openblas_pthread/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.
-OpenBLAS is an open source project supported by
-Lab of Parallel Software and Computational Science, ISCAS.
-
-This package builds the parallel library using pthreads.
diff --git a/openblas_pthread/Makefile b/openblas_pthread/Makefile
deleted file mode 100644
index 48565c355a..0000000000
--- a/openblas_pthread/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD$
-
-MAINTAINER=	thomas.orgis%uni-hamburg.de@localhost
-
-OPENBLAS_VARIANT= openblas_pthread
-.include "../../wip/openblas/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/openblas_pthread/buildlink3.mk b/openblas_pthread/buildlink3.mk
deleted file mode 100644
index 98c8293e9a..0000000000
--- a/openblas_pthread/buildlink3.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+=	openblas_pthread
-
-.if !defined(OPENBLAS_PTHREAD_BUILDLINK3_MK)
-OPENBLAS_PTHREAD_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.openblas_pthread+=	openblas_pthread>=0.3.5
-BUILDLINK_PKGSRCDIR.openblas_pthread?=		../../wip/openblas_pthread
-.endif	# OPENBLAS_PTHREAD_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-openblas_pthread


Home | Main Index | Thread Index | Old Index