diff --git a/c_xerbla_no-void-return.patch b/c_xerbla_no-void-return.patch index 39f8c7d..741b21c 100644 --- a/c_xerbla_no-void-return.patch +++ b/c_xerbla_no-void-return.patch @@ -1,7 +1,8 @@ -diff -ur GotoBLAS2-orig/ctest/c_xerbla.c GotoBLAS2/ctest/c_xerbla.c ---- GotoBLAS2-orig/ctest/c_xerbla.c 2009-09-10 23:52:13.000000000 +0200 -+++ GotoBLAS2/ctest/c_xerbla.c 2010-11-26 23:37:45.000000000 +0100 -@@ -131,7 +131,7 @@ +Index: OpenBLAS-0.2.8/ctest/c_xerbla.c +=================================================================== +--- OpenBLAS-0.2.8.orig/ctest/c_xerbla.c ++++ OpenBLAS-0.2.8/ctest/c_xerbla.c +@@ -131,7 +131,7 @@ void F77_xerbla(char *srname, void *vinf int BLASFUNC(xerbla)(char *name, blasint *info, blasint length) { F77_xerbla(name, info); diff --git a/openblas-0.2.6-libs.patch b/openblas-0.2.6-libs.patch deleted file mode 100644 index a527d02..0000000 --- a/openblas-0.2.6-libs.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -aruN xianyi-OpenBLAS-87b4d0c.orig/exports/Makefile xianyi-OpenBLAS-87b4d0c/exports/Makefile ---- xianyi-OpenBLAS-87b4d0c.orig/exports/Makefile 2013-03-02 07:42:06.000000000 +0100 -+++ xianyi-OpenBLAS-87b4d0c/exports/Makefile 2013-03-02 17:14:17.414240016 +0100 -@@ -18,10 +18,9 @@ - NO_LAPACKE = 0 - endif - --ifeq ($(OSNAME), WINNT) - ifeq ($(F_COMPILER), GFORTRAN) - EXTRALIB += -lgfortran --endif -+ - ifeq ($(USE_OPENMP), 1) - ifeq ($(C_COMPILER), GCC) - EXTRALIB += -lgomp -@@ -29,11 +28,6 @@ - endif - endif - --ifeq ($(OSNAME), CYGWIN_NT) --ifeq ($(F_COMPILER), GFORTRAN) --EXTRALIB += -lgfortran --endif --endif - - all:: - diff --git a/openblas-0.2.7-noexecstack.patch b/openblas-0.2.7-noexecstack.patch deleted file mode 100644 index 60af772..0000000 --- a/openblas-0.2.7-noexecstack.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -aruN xianyi-OpenBLAS-0b951b2.orig/exports/Makefile xianyi-OpenBLAS-0b951b2/exports/Makefile ---- xianyi-OpenBLAS-0b951b2.orig/exports/Makefile 2013-07-25 19:34:45.000000000 +0200 -+++ xianyi-OpenBLAS-0b951b2/exports/Makefile 2013-07-26 22:28:17.038560497 +0200 -@@ -117,6 +117,7 @@ - - ../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c - $(CC) $(CFLAGS) -shared -o ../$(LIBSONAME) \ -+ -Wl,-z,noexecstack \ - -Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \ - -Wl,--retain-symbols-file=linux.def -Wl,-soname,$(LIBPREFIX).so.$(MAJOR_VERSION) $(EXTRALIB) - ifneq ($(C_COMPILER), LSB) -@@ -136,6 +137,7 @@ - - ../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c - $(CC) $(CFLAGS) -shared -o ../$(LIBSONAME) \ -+ -Wl,-z,noexecstack \ - -Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \ - -Wl,--retain-symbols-file=linux.def $(FEXTRALIB) $(EXTRALIB) - $(CC) $(CFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK. -@@ -155,6 +157,7 @@ - - so : ../$(LIBSONAME) - $(CC) $(CFLAGS) -shared -o ../$(LIBSONAME) \ -+ -Wl,-z,noexecstack \ - -Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive $(EXTRALIB) - $(CC) $(CFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK. - rm -f linktest diff --git a/openblas-0.2.8-libs.patch b/openblas-0.2.8-libs.patch new file mode 100644 index 0000000..e6b5898 --- /dev/null +++ b/openblas-0.2.8-libs.patch @@ -0,0 +1,28 @@ +Index: OpenBLAS-0.2.8/exports/Makefile +=================================================================== +--- OpenBLAS-0.2.8.orig/exports/Makefile ++++ OpenBLAS-0.2.8/exports/Makefile +@@ -22,10 +22,9 @@ ifndef NEED2UNDERSCORES + NEED2UNDERSCORES=0 + endif + +-ifeq ($(OSNAME), WINNT) + ifeq ($(F_COMPILER), GFORTRAN) + EXTRALIB += -lgfortran +-endif ++ + ifeq ($(USE_OPENMP), 1) + ifeq ($(C_COMPILER), GCC) + EXTRALIB += -lgomp +@@ -33,11 +32,6 @@ endif + endif + endif + +-ifeq ($(OSNAME), CYGWIN_NT) +-ifeq ($(F_COMPILER), GFORTRAN) +-EXTRALIB += -lgfortran +-endif +-endif + + all:: + diff --git a/openblas-0.2.8-noexecstack.patch b/openblas-0.2.8-noexecstack.patch new file mode 100644 index 0000000..6c4969f --- /dev/null +++ b/openblas-0.2.8-noexecstack.patch @@ -0,0 +1,28 @@ +Index: OpenBLAS-0.2.8/exports/Makefile +=================================================================== +--- OpenBLAS-0.2.8.orig/exports/Makefile ++++ OpenBLAS-0.2.8/exports/Makefile +@@ -115,6 +115,7 @@ so : ../$(LIBSONAME) + + ../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c + $(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \ ++ -Wl,-z,noexecstack \ + -Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \ + -Wl,--retain-symbols-file=linux.def -Wl,-soname,$(LIBPREFIX).so.$(MAJOR_VERSION) $(EXTRALIB) + ifneq ($(C_COMPILER), LSB) +@@ -134,6 +135,7 @@ so : ../$(LIBSONAME) + + ../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c + $(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \ ++ -Wl,-z,noexecstack \ + -Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \ + -Wl,--retain-symbols-file=linux.def $(FEXTRALIB) $(EXTRALIB) + $(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK. +@@ -153,6 +155,7 @@ ifeq ($(OSNAME), SunOS) + + so : ../$(LIBSONAME) + $(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \ ++ -Wl,-z,noexecstack \ + -Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive $(EXTRALIB) + $(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK. + rm -f linktest diff --git a/openblas.changes b/openblas.changes index 4672883..bb65acc 100644 --- a/openblas.changes +++ b/openblas.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Apr 4 20:32:24 UTC 2014 - dmitry_r@opensuse.org + +- Update to version 0.2.8 + * Add executable stack markings. + * Respect user's LDFLAGS + * Rollback bulldozer and piledriver kernels to barcelona kernels + * update openblas-0.2.6-libs.patch + * update c_xerbla_no-void-return.patch + * update openblas-0.2.7-noexecstack.patch + ------------------------------------------------------------------- Fri Jul 26 20:31:17 UTC 2013 - scorot@free.fr diff --git a/openblas.spec b/openblas.spec index f89e56d..245707e 100644 --- a/openblas.spec +++ b/openblas.spec @@ -1,7 +1,7 @@ # # spec file for package openblas # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,22 +17,22 @@ Name: openblas -Version: 0.2.7 +Version: 0.2.8 Release: 0 Summary: An optimized BLAS library based on GotoBLAS2 License: BSD-3-Clause Group: Productivity/Scientific/Math -Url: https://github.com/xianyi/OpenBLAS/ -Source0: http://github.com/xianyi/OpenBLAS/tarball/v%{version}/xianyi-OpenBLAS-v%{version}-0-gf26b7a0.tar.gz -# PATCH-FIX-UPSTREAM openblas-0.1.1-libs.patch: Link against libgfortran -Patch0: openblas-0.2.6-libs.patch +Url: http://www.openblas.net +Source0: https://github.com/xianyi/OpenBLAS/archive/v%{version}.tar.gz +# PATCH-FIX-UPSTREAM openblas-0.2.8-libs.patch: Link against libgfortran +Patch0: openblas-0.2.8-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 Patch2: openblas-0.1.0-soname.patch -# PATCH-FIX-UPSTREAM openblas-0.2.7-noexecstack.patch -Patch3: openblas-0.2.7-noexecstack.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +# PATCH-FIX-UPSTREAM openblas-0.2.8-noexecstack.patch +Patch3: openblas-0.2.8-noexecstack.patch +BuildRoot: %{_tmppath}/build ExclusiveArch: %ix86 ia64 ppc ppc64 x86_64 BuildRequires: gcc-fortran BuildRequires: update-alternatives @@ -44,7 +44,7 @@ OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version. The project is supported by the Lab of Parallel Software and Computational Science, ISCAS. http://www.rdcps.ac.cn -%package -n libopenblas0 +%package -n libopenblas0 Summary: An optimized BLAS library based on GotoBLAS2, serial version Group: System/Libraries @@ -54,7 +54,7 @@ project is supported by the Lab of Parallel Software and Computational Science, ISCAS. http://www.rdcps.ac.cn -%package -n libopenblaso0 +%package -n libopenblaso0 Summary: An optimized BLAS library based on GotoBLAS2, OpenMP version Group: System/Libraries @@ -65,7 +65,7 @@ ISCAS. http://www.rdcps.ac.cn This package contains the library compiled with OpenMP support. -%package -n libopenblasp0 +%package -n libopenblasp0 Summary: An optimized BLAS library based on GotoBLAS2, pthreads version Group: System/Libraries @@ -76,26 +76,26 @@ ISCAS. http://www.rdcps.ac.cn This package contains the library compiled with threading support. -%package devel +%package devel Summary: Development headers and libraries for OpenBLAS Group: Development/Libraries/C and C++ Requires: lib%{name}0 = %{version} Requires: lib%{name}o0 = %{version} Requires: lib%{name}p0 = %{version} -%description devel +%description devel OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version. The project is supported by the Lab of Parallel Software and Computational Science, ISCAS. http://www.rdcps.ac.cn This package contains the development headers and libraries. -%package devel-static +%package devel-static Summary: Static version of OpenBLAS Group: Development/Libraries/C and C++ Requires: %{name}-devel = %{version} -%description devel-static +%description devel-static OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version. The project is supported by the Lab of Parallel Software and Computational Science, ISCAS. http://www.rdcps.ac.cn @@ -107,18 +107,17 @@ This package contains the static libraries. # Untar source tar -zxf %{SOURCE0} -mv xianyi-OpenBLAS-*/ xianyi-OpenBLAS -cd xianyi-OpenBLAS +cd OpenBLAS-%{version} %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 -cd .. +cd .. # prepare build for serial, threaded and OpenMP versions -cp -ar xianyi-OpenBLAS openmp -cp -ar xianyi-OpenBLAS threaded -mv xianyi-OpenBLAS serial +cp -ar OpenBLAS-%{version} openmp +cp -ar OpenBLAS-%{version} threaded +mv OpenBLAS-%{version} serial %build # Make serial, threaded and OpenMP versions diff --git a/v0.2.8.tar.gz b/v0.2.8.tar.gz new file mode 100644 index 0000000..d32cbc3 --- /dev/null +++ b/v0.2.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:359f5cd2604ed76d97b0669b9b846a59a1d0283065d23f8847956629871fedd8 +size 9466378 diff --git a/xianyi-OpenBLAS-v0.2.7-0-gf26b7a0.tar.gz b/xianyi-OpenBLAS-v0.2.7-0-gf26b7a0.tar.gz deleted file mode 100644 index b4d14de..0000000 --- a/xianyi-OpenBLAS-v0.2.7-0-gf26b7a0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a2969a6efa04f340fe19c27f6f5e3a51a71ba05777ebf1e64f69260646f62597 -size 9471386