openblas: update to 0.3.5

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: openblas: update to 0.3.5
From: Dr. Thomas Orgis <thomas.orgis%uni-hamburg.de@localhost>
Date: Fri, 22 Mar 2019 18:16:20 +0000
Module Name:	pkgsrc-wip
Committed By:	Dr. Thomas Orgis <thomas.orgis%uni-hamburg.de@localhost>
Pushed By:	thor
Date:		Fri Mar 22 19:16:20 2019 +0100
Changeset:	9bf4926af0c3dabfaae4331ec0a89a249be885bf

Modified Files:
	openblas/Makefile.common
	openblas/buildlink3.mk
	openblas/distinfo
	openblas/patches/patch-Makefile
	openblas/patches/patch-Makefile.install
	openblas/patches/patch-Makefile.system
	openblas/patches/patch-exports+Makefile
	openblas/patches/patch-getarch.c
Removed Files:
	openblas/patches/patch-cpuid_sparc.c

Log Message:
openblas: update to 0.3.5

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

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

diffstat:
 openblas/Makefile.common                |  4 ++--
 openblas/buildlink3.mk                  |  2 +-
 openblas/distinfo                       | 19 +++++++++----------
 openblas/patches/patch-Makefile         | 33 ++++++++++++++++-----------------
 openblas/patches/patch-Makefile.install | 14 +++++++-------
 openblas/patches/patch-Makefile.system  | 20 ++++++++++++--------
 openblas/patches/patch-cpuid_sparc.c    | 13 -------------
 openblas/patches/patch-exports+Makefile | 10 +++++-----
 openblas/patches/patch-getarch.c        |  8 +++-----
 9 files changed, 55 insertions(+), 68 deletions(-)

diffs:
diff --git a/openblas/Makefile.common b/openblas/Makefile.common
index 399283e045..ab39c6df28 100644
--- a/openblas/Makefile.common
+++ b/openblas/Makefile.common
@@ -4,7 +4,7 @@
 # OPENBLAS_VARIANT = (openblas|openblas_pthread|openblas_openmp)
 # being set.
 
-PORTVERSION=	0.2.20
+PORTVERSION=	0.3.5
 DISTNAME=	OpenBLAS-${PORTVERSION}
 PKGNAME=	${OPENBLAS_VARIANT}-${PORTVERSION}
 # ThOr: I do not like that. Can we rather rename the benchmark files
@@ -140,7 +140,7 @@ SUBST_FILES.threads+=	${WRKSRC}/ctest/Makefile
 SUBST_CLASSES+=		pc
 SUBST_STAGE.pc=		post-patch
 SUBST_SED.pc+=		-e 's+-lopenblas+-l${OPENBLAS_VARIANT}+'
-SUBST_SED.pc+=		-e 's+openblas.pc$$+${OPENBLAS_VARIANT}.pc+'
+SUBST_SED.pc+=		-e 's+openblas.pc"+${OPENBLAS_VARIANT}.pc"+'
 SUBST_FILES.pc+=	Makefile.install openblas.pc.in
 
 post-extract:
diff --git a/openblas/buildlink3.mk b/openblas/buildlink3.mk
index 6e4679d997..8c37429b0c 100644
--- a/openblas/buildlink3.mk
+++ b/openblas/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	openblas
 .if !defined(OPENBLAS_BUILDLINK3_MK)
 OPENBLAS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.openblas+=	openblas>=0.2.20
+BUILDLINK_API_DEPENDS.openblas+=	openblas>=0.3.5
 BUILDLINK_PKGSRCDIR.openblas?=		../../wip/openblas
 .endif	# OPENBLAS_BUILDLINK3_MK
 
diff --git a/openblas/distinfo b/openblas/distinfo
index 03946a073c..8559e7581e 100644
--- a/openblas/distinfo
+++ b/openblas/distinfo
@@ -1,9 +1,9 @@
 $NetBSD$
 
-SHA1 (openblas/OpenBLAS-0.2.20.tar.gz) = a186074145a24823e82c65672dad1cd1ca6fe89c
-RMD160 (openblas/OpenBLAS-0.2.20.tar.gz) = 2b9728cd227894d7378b0f3686b90d0e7e7975d9
-SHA512 (openblas/OpenBLAS-0.2.20.tar.gz) = 8dfc8e8c8d456b834d2e9544c8eadd9f4770e30db8b8dd76af601ec0735fd86c9cf63dd6a03ccd23fc02ec2e05069a09875b9073dfe29f99aadab3a958ae2634
-Size (openblas/OpenBLAS-0.2.20.tar.gz) = 11637301 bytes
+SHA1 (openblas/OpenBLAS-0.3.5.tar.gz) = 3ec3607d37c2ea1f7ec1d255f5f38d437489c24d
+RMD160 (openblas/OpenBLAS-0.3.5.tar.gz) = 9b7aa282cc2e5925219d14502bdd32917d0bbcdd
+SHA512 (openblas/OpenBLAS-0.3.5.tar.gz) = 91b3074eb922453bf843158b4281cde65db9e8bbdd7590e75e9e6cdcb486157f7973f2936f327bb3eb4f1702ce0ba51ae6729d8d4baf2d986c50771e8f696df0
+Size (openblas/OpenBLAS-0.3.5.tar.gz) = 11848689 bytes
 SHA1 (openblas/large.tgz) = a689e5b180595b40c5719b0f358b31b15b57a2db
 RMD160 (openblas/large.tgz) = 8010ff4002ef42cf22a9ee9345011d68fc27d855
 SHA512 (openblas/large.tgz) = e24db2b8a4253ccff9ca196815901c1fefd55e882f4fe1085715ac84b8f318e1842a91072130c17fdd144344ffc80233a77500da9349acb54e504b3935825965
@@ -12,18 +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) = d533eab4e8cdbe465e4051208b388015ebc16115
-SHA1 (patch-Makefile.install) = 8461553ff8a89e482928f379e639c9bc0d9e061a
+SHA1 (patch-Makefile) = be2840ae6bad78b097d9aa313d533453831ff1c3
+SHA1 (patch-Makefile.install) = bb5a0eb80e9b13c18bd06bb7a03e7b0f256a7bcb
 SHA1 (patch-Makefile.rule) = 72108fa4d1e8279f78c01606d21b9149947afdaa
-SHA1 (patch-Makefile.system) = c4a8ba678b95bff90c50fbb3d4bf6eba61eaebfd
+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-cpuid_sparc.c) = 709647898b963b6afaa7ab91147dc9f261e3da02
 SHA1 (patch-driver_others_memory.c) = 76d7ef5cfcf2a322182ed454a7416a8323329417
-SHA1 (patch-exports+Makefile) = 2429badefe7f379739c41ae142da0cffd41f46cf
+SHA1 (patch-exports+Makefile) = a2d2084c31b439d3d22cdc5a32dcb7aec2bd0467
 SHA1 (patch-f_check) = 11751e7e779790a47f80f825555bb24d072d0f30
-SHA1 (patch-getarch.c) = e9c56fcaf243def96f9fc8728ff65108e81fd977
+SHA1 (patch-getarch.c) = 8e6d0ab14b2fb42827b7cad91030672ab1aaab4c
 SHA1 (patch-interface__ztrmv.c) = fefab5887bfc735fb5050df051f39b03201cee2c
diff --git a/openblas/patches/patch-Makefile b/openblas/patches/patch-Makefile
index 07c188d8b1..148dd028e6 100644
--- a/openblas/patches/patch-Makefile
+++ b/openblas/patches/patch-Makefile
@@ -1,18 +1,17 @@
 $NetBSD$
 
-# Avoid name collision on ARCH
-# Also remove special library names.
---- Makefile.orig	2015-10-27 20:44:50 UTC
-+++ Makefile
-@@ -89,7 +89,6 @@
- ifeq ($(OSNAME), $(filter $(OSNAME),Linux SunOS Android))
+# 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 @@
+ ifeq ($(OSNAME), $(filter $(OSNAME),Linux SunOS Android Haiku))
  	@$(MAKE) -C exports so
  	@ln -fs $(LIBSONAME) $(LIBPREFIX).so
 -	@ln -fs $(LIBSONAME) $(LIBPREFIX).so.$(MAJOR_VERSION)
  endif
- ifeq ($(OSNAME), FreeBSD)
+ ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD OpenBSD NetBSD DragonFly))
  	@$(MAKE) -C exports so
-@@ -101,7 +100,6 @@
+@@ -108,7 +107,6 @@
  endif
  ifeq ($(OSNAME), Darwin)
  	@$(MAKE) -C exports dyn
@@ -20,7 +19,7 @@ $NetBSD$
  endif
  ifeq ($(OSNAME), WINNT)
  	@$(MAKE) -C exports dll
-@@ -135,7 +133,6 @@
+@@ -142,7 +140,6 @@
  	$(error OpenBLAS: neither static nor shared are enabled.)
  endif
  endif
@@ -28,7 +27,7 @@ $NetBSD$
  	@for d in $(SUBDIRS) ; \
  	do if test -d $$d; then \
  	  $(MAKE) -C $$d $(@F) || exit 1 ; \
-@@ -166,7 +163,6 @@
+@@ -176,7 +173,6 @@
  prof : prof_blas prof_lapack
  
  prof_blas :
@@ -36,7 +35,7 @@ $NetBSD$
  	for d in $(SUBDIRS) ; \
  	do if test -d $$d; then \
  	  $(MAKE) -C $$d prof || exit 1 ; \
-@@ -177,7 +173,6 @@
+@@ -187,7 +183,6 @@
  endif
  
  blas :
@@ -44,7 +43,7 @@ $NetBSD$
  	for d in $(BLASDIRS) ; \
  	do if test -d $$d; then \
  	  $(MAKE) -C $$d libs || exit 1 ; \
-@@ -185,7 +180,6 @@
+@@ -195,7 +190,6 @@
  	done
  
  hpl :
@@ -52,7 +51,7 @@ $NetBSD$
  	for d in $(BLASDIRS) ../laswp exports ; \
  	do if test -d $$d; then \
  	  $(MAKE) -C $$d $(@F) || exit 1 ; \
-@@ -199,7 +193,6 @@
+@@ -209,7 +203,6 @@
  endif
  
  hpl_p :
@@ -60,12 +59,12 @@ $NetBSD$
  	for d in $(SUBDIRS) ../laswp exports ; \
  	do if test -d $$d; then \
  	  $(MAKE) -C $$d $(@F) || exit 1 ; \
-@@ -238,7 +238,7 @@ ifndef NOFORTRAN
+@@ -251,7 +244,7 @@
  	-@echo "LOADOPTS    = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
  	-@echo "CC          = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc
  	-@echo "override CFLAGS      = $(LAPACK_CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
--	-@echo "ARCH        = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
-+	-@echo "ARCH_       = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
- 	-@echo "ARCHFLAGS   = -ru" >> $(NETLIB_LAPACK_DIR)/make.inc
+-	-@echo "override ARCH        = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
++	-@echo "override ARCH_        = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
+ 	-@echo "ARCHFLAGS   = $(ARFLAGS) -ru" >> $(NETLIB_LAPACK_DIR)/make.inc
  	-@echo "RANLIB      = $(RANLIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
  	-@echo "LAPACKLIB   = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
diff --git a/openblas/patches/patch-Makefile.install b/openblas/patches/patch-Makefile.install
index 2e0e58b41c..b9c7d6f013 100644
--- a/openblas/patches/patch-Makefile.install
+++ b/openblas/patches/patch-Makefile.install
@@ -1,9 +1,9 @@
 @NetBSD@
 
 Second part of removing the special library names.
---- Makefile.install.orig	2018-03-29 21:56:08.931407291 +0200
-+++ Makefile.install	2018-03-29 21:59:19.864394270 +0200
-@@ -60,8 +60,6 @@
+--- 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 @@
  ifndef NO_STATIC
  	@echo Copying the static library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
  	@install -pm644 $(LIBNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
@@ -12,13 +12,13 @@ Second part of removing the special library names.
  endif
  #for install shared library
  ifndef NO_SHARED
-@@ -69,8 +67,7 @@
- ifeq ($(OSNAME), $(filter $(OSNAME),Linux SunOS Android))
+@@ -70,8 +68,7 @@
+ ifeq ($(OSNAME), $(filter $(OSNAME),Linux SunOS Android Haiku))
  	@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), FreeBSD)
- 	@cp $(LIBSONAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
+ 
+ ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD OpenBSD NetBSD DragonFly))
diff --git a/openblas/patches/patch-Makefile.system b/openblas/patches/patch-Makefile.system
index fbccf89959..0c1e5c7409 100644
--- a/openblas/patches/patch-Makefile.system
+++ b/openblas/patches/patch-Makefile.system
@@ -2,18 +2,17 @@ $NetBSD$
 
 Fully control the library name via LIBNAMESUFFIX
 And the ARCH_ thing.
---- Makefile.system.orig	
-2017-07-24 06:03:35.000000000 +0200
-+++ Makefile.system	2018-03-29 23:01:57.894137990 +0200
-@@ -230,6 +230,7 @@
+--- 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 @@
  endif
  
- ifeq ($(OSNAME), FreeBSD)
+ ifneq (,$(findstring $(OSNAME), FreeBSD OpenBSD DragonFly))
 +EXTRALIB	+= -lm %%LDFLAGS%%
  MD5SUM = md5 -r
  endif
  
-@@ -1089,27 +1090,11 @@
+@@ -1204,31 +1205,15 @@
  LIBSUFFIX = a
  endif
  
@@ -39,12 +38,17 @@ And the ARCH_ thing.
 +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)
- LIBEXPNAME   = $(LIBNAME:.$(LIBSUFFIX)=.exp)
-@@ -1139,7 +1124,7 @@
+@@ -1259,7 +1244,7 @@
  endif
  
  export OSNAME
diff --git a/openblas/patches/patch-cpuid_sparc.c b/openblas/patches/patch-cpuid_sparc.c
deleted file mode 100644
index bc6f502590..0000000000
--- a/openblas/patches/patch-cpuid_sparc.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
-# Add sparc support
---- cpuid_sparc.c.orig	2015-10-27 20:44:50 UTC
-+++ cpuid_sparc.c
-@@ -49,6 +49,7 @@ void get_subdirname(void){
- }
- 
- void get_cpuconfig(void){
-+  printf("#define SPARC\n");
-   printf("#define V9\n");
-   printf("#define DTB_DEFAULT_ENTRIES 32\n");
- }
diff --git a/openblas/patches/patch-exports+Makefile b/openblas/patches/patch-exports+Makefile
index 4299ac8e07..ce4a144846 100644
--- a/openblas/patches/patch-exports+Makefile
+++ b/openblas/patches/patch-exports+Makefile
@@ -1,17 +1,17 @@
 $NetBSD$
 
 # Improve dynamic lib naming
---- exports/Makefile.orig	2015-10-27 20:44:50 UTC
-+++ exports/Makefile
-@@ -140,6 +140,7 @@ endif
+--- 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 @@
  #http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
- ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD NetBSD))
+ ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD OpenBSD NetBSD DragonFly))
  
 +EXTRALIB += -lgfortran
  so : ../$(LIBSONAME)
  
  ifeq (, $(SYMBOLPREFIX)$(SYMBOLSUFFIX))
-@@ -151,6 +152,7 @@ else
+@@ -171,6 +172,7 @@
  endif
  	$(CC) $(CFLAGS) $(LDFLAGS)  -shared -o ../$(LIBSONAME) \
  	-Wl,--whole-archive $< -Wl,--no-whole-archive \
diff --git a/openblas/patches/patch-getarch.c b/openblas/patches/patch-getarch.c
index 875bce4275..b406b12c59 100644
--- a/openblas/patches/patch-getarch.c
+++ b/openblas/patches/patch-getarch.c
@@ -1,9 +1,9 @@
 @NetBSD@
 
 Do not override our parallel make choice.
---- getarch.c.orig	2018-04-03 12:56:19.322128443 +0200
-+++ getarch.c	2018-04-03 12:57:42.424122776 +0200
-@@ -1134,21 +1134,6 @@
+--- 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 @@
  #endif
  #endif
  
@@ -17,10 +17,8 @@ Do not override our parallel make choice.
 -#elif NO_PARALLEL_MAKE==1
 -    printf("MAKE += -j 1\n");
 -#else
--#ifndef OS_WINDOWS
 -    printf("MAKE += -j %d\n", get_num_cores());
 -#endif
--#endif
 -
      break;
Prev by Date: +xtl-quant-stack, +zimpl
Next by Date: openblas: update to 0.3.5
Previous by Thread: +xtl-quant-stack, +zimpl
Next by Thread: openblas: update to 0.3.5
Indexes:
Home | Main Index | Thread Index | Old Index