Accepting request 263945 from home:Dmitry_R:branches:science

OBS-URL: https://build.opensuse.org/request/show/263945
OBS-URL: https://build.opensuse.org/package/show/science/openblas?expand=0&rev=33

openblas-0.1.0-soname.patch

@@ -1,12 +0,0 @@
-diff -ur xianyi-OpenBLAS-7c1db22-orig/Makefile.system xianyi-OpenBLAS-7c1db22/Makefile.system
---- xianyi-OpenBLAS-7c1db22-orig/Makefile.system	2012-03-23 11:52:40.000000000 +0100
-+++ xianyi-OpenBLAS-7c1db22/Makefile.system	2012-04-25 20:33:00.645392171 +0200
-@@ -584,7 +584,7 @@
- ifndef LIBNAMESUFFIX
- LIBPREFIX = libopenblas
- else
--LIBPREFIX = libopenblas_$(LIBNAMESUFFIX)
-+LIBPREFIX = libopenblas$(LIBNAMESUFFIX)
- endif
- 
- KERNELDIR	= $(TOPDIR)/kernel/$(ARCH)

openblas-0.2.12.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b41f71f46faab1215f6f6d17541113dc01fd4d8fee0694f3f459bc2e3c2aaaaf
-size 9848814

openblas-0.2.13.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5f1f986a1900949058b578c61c2b65b4de324f1968ec505daeb526b9f9af14ab
+size 9853510

openblas-noexecstack.patch

@@ -1,24 +1,24 @@
-Index: OpenBLAS-0.2.9/exports/Makefile
+Index: OpenBLAS-0.2.13/exports/Makefile
 ===================================================================
---- OpenBLAS-0.2.9.orig/exports/Makefile
+--- OpenBLAS-0.2.13.orig/exports/Makefile
-+++ OpenBLAS-0.2.9/exports/Makefile
++++ OpenBLAS-0.2.13/exports/Makefile
-@@ -101,6 +101,7 @@ so : ../$(LIBSONAME)
+@@ -118,6 +118,7 @@ else
- ../$(LIBSONAME) : ../$(LIBNAME) linktest.c
+ endif
  ifneq ($(C_COMPILER), LSB)
  	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
 +	-Wl,-z,noexecstack \
- 	-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
+ 	-Wl,--whole-archive $< -Wl,--no-whole-archive \
  	-Wl,-soname,$(LIBPREFIX).so.$(MAJOR_VERSION) $(EXTRALIB)
  	$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
-@@ -122,6 +123,7 @@ so : ../$(LIBSONAME)
+@@ -145,6 +146,7 @@ else
- 
+ ../$(LIBSONAME) : ../$(LIBNAME).renamed linktest.c
- ../$(LIBSONAME) : ../$(LIBNAME) linktest.c
+ endif
  	$(CC) $(CFLAGS) $(LDFLAGS)  -shared -o ../$(LIBSONAME) \
 +	-Wl,-z,noexecstack \
- 	-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
+ 	-Wl,--whole-archive $< -Wl,--no-whole-archive \
  	$(FEXTRALIB) $(EXTRALIB)
  	$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
-@@ -141,6 +143,7 @@ ifeq ($(OSNAME), SunOS)
+@@ -164,6 +166,7 @@ ifeq ($(OSNAME), SunOS)
  
  so : ../$(LIBSONAME)
  	$(CC) $(CFLAGS) $(LDFLAGS)  -shared -o ../$(LIBSONAME) \

openblas-soname.patch

@@ -0,0 +1,13 @@
+Index: OpenBLAS-0.2.13/Makefile.system
+===================================================================
+--- OpenBLAS-0.2.13.orig/Makefile.system
++++ OpenBLAS-0.2.13/Makefile.system
+@@ -844,7 +844,7 @@ endif
+ ifndef LIBNAMESUFFIX
+ LIBPREFIX = libopenblas
+ else
+-LIBPREFIX = libopenblas_$(LIBNAMESUFFIX)
++LIBPREFIX = libopenblas$(LIBNAMESUFFIX)
+ endif
+ 
+ ifndef SYMBOLPREFIX

openblas.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed Dec  3 16:06:49 UTC 2014 - dmitry_r@opensuse.org
+
+- Update to version 0.2.12
+  * Add SYMBOLPREFIX and SYMBOLSUFFIX makefile options
+    for adding a prefix or suffix to all exported symbol names
+    in the shared library.
+  * Remove openblas-0.1.0-soname.patch
+  * Add openblas-soname.patch
+  * Rebase openblas-noexecstack.patch
+  x86/x86-64:
+  * Add generic kernel files for x86-64. make TARGET=GENERIC
+  * Fix a bug of sgemm kernel on Intel Sandy Bridge.
+  * Fix c_check bug on some amd64 systems.
+  ARM:
+  * Support APM's X-Gene 1 AArch64 processors.
+  * Optimize trmm and sgemm.
+
 -------------------------------------------------------------------
 Fri Oct 17 13:09:58 UTC 2014 - dmitry_r@opensuse.org
 

openblas.spec

@@ -17,7 +17,7 @@
 
 
 Name:           openblas
-Version:        0.2.12
+Version:        0.2.13
 Release:        0
 Summary:        An optimized BLAS library based on GotoBLAS2
 License:        BSD-3-Clause
@@ -28,8 +28,8 @@ Source0:        https://github.com/xianyi/OpenBLAS/archive/v%{version}.tar.gz#/%
 Patch0:         openblas-libs.patch
 # PATCH-FIX-UPSTREAM c_xerbla_no-void-return.patch
 Patch1:         c_xerbla_no-void-return.patch
-# PATCH-FEATURE-OPENSUSE openblas-0.1.0-soname.patch
+# PATCH-FEATURE-OPENSUSE openblas-soname.patch
-Patch2:         openblas-0.1.0-soname.patch
+Patch2:         openblas-soname.patch
 # PATCH-FIX-UPSTREAM openblas-noexecstack.patch
 Patch3:         openblas-noexecstack.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -169,6 +169,9 @@ ln -sf lib%{name}p.so.0 lib%{name}p.so
 #  execstack -c $lib
 # done
 
+# Remove Config.cmake (we use custom libraries configuration)
+rm %{buildroot}%{_prefix}/cmake/OpenBLASConfig.cmake
+
 %post -n libopenblas0
 "%_sbindir/update-alternatives" --install \
    %{_libdir}/libblas.so.3 libblas.so.3 %{_libdir}/libopenblas.so.0  20