diff --git a/.gitignore b/.gitignore index 83cd3f9..96dbb9d 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /openblas-0.3.7.tar.gz /openblas-0.3.8.tar.gz /openblas-0.3.9.tar.gz +/openblas-0.3.10.tar.gz diff --git a/ee2e758278b5d82b7242f505ea694f082ef65879.patch b/ee2e758278b5d82b7242f505ea694f082ef65879.patch deleted file mode 100644 index e4fc0d4..0000000 --- a/ee2e758278b5d82b7242f505ea694f082ef65879.patch +++ /dev/null @@ -1,73 +0,0 @@ -From ee2e758278b5d82b7242f505ea694f082ef65879 Mon Sep 17 00:00:00 2001 -From: Martin Kroeker -Date: Fri, 13 Mar 2020 20:34:13 +0100 -Subject: [PATCH] Move declarations of lapack_complex_custom types outside the - extern C - -fixes #2510 ---- - lapack-netlib/LAPACKE/include/lapack.h | 44 ++++++++++++++------------ - 1 file changed, 23 insertions(+), 21 deletions(-) - -diff --git a/lapack-netlib/LAPACKE/include/lapack.h b/lapack-netlib/LAPACKE/include/lapack.h -index 0a6226fe4..36e53ec24 100644 ---- a/lapack-netlib/LAPACKE/include/lapack.h -+++ b/lapack-netlib/LAPACKE/include/lapack.h -@@ -12,27 +12,6 @@ - - #include - --#ifdef __cplusplus --extern "C" { --#endif -- --/*----------------------------------------------------------------------------*/ --#ifndef lapack_int --#define lapack_int int --#endif -- --#ifndef lapack_logical --#define lapack_logical lapack_int --#endif -- --/* f2c, hence clapack and MacOS Accelerate, returns double instead of float -- * for sdot, slange, clange, etc. */ --#if defined(LAPACK_F2C) -- typedef double lapack_float_return; --#else -- typedef float lapack_float_return; --#endif -- - /* Complex types are structures equivalent to the - * Fortran complex types COMPLEX(4) and COMPLEX(8). - * -@@ -88,6 +67,29 @@ extern "C" { - - #endif /* LAPACK_COMPLEX_CUSTOM */ - -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+/*----------------------------------------------------------------------------*/ -+#ifndef lapack_int -+#define lapack_int int -+#endif -+ -+#ifndef lapack_logical -+#define lapack_logical lapack_int -+#endif -+ -+/* f2c, hence clapack and MacOS Accelerate, returns double instead of float -+ * for sdot, slange, clange, etc. */ -+#if defined(LAPACK_F2C) -+ typedef double lapack_float_return; -+#else -+ typedef float lapack_float_return; -+#endif -+ -+ - /* Callback logical functions of one, two, or three arguments are used - * to select eigenvalues to sort to the top left of the Schur form. - * The value is selected if function returns TRUE (non-zero). */ diff --git a/openblas.spec b/openblas.spec index 3e2aef8..d0595f1 100644 --- a/openblas.spec +++ b/openblas.spec @@ -14,8 +14,8 @@ # "obsoleted" features are still kept in the spec. Name: openblas -Version: 0.3.9 -Release: 3%{?dist} +Version: 0.3.10 +Release: 1%{?dist} Summary: An optimized BLAS library based on GotoBLAS2 License: BSD URL: https://github.com/xianyi/OpenBLAS/ @@ -29,9 +29,6 @@ Patch2: openblas-0.2.15-constructor.patch # Supply the proper flags to the test makefile Patch3: openblas-0.3.7-tests.patch -# Fix C++ compatibility (BZ #1820131) -Patch4: https://github.com/xianyi/OpenBLAS/commit/ee2e758278b5d82b7242f505ea694f082ef65879.patch - BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: gcc-gfortran @@ -244,7 +241,6 @@ cd OpenBLAS-%{version} %patch2 -p1 -b .constructor %endif %patch3 -p1 -b .tests -%patch4 -p1 -b .cplusplus # Fix source permissions find -name \*.f -exec chmod 644 {} \; @@ -668,6 +664,9 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig %endif %changelog +* Mon Jun 15 2020 Susi Lehtola - 0.3.10-1 +- Update to 0.3.10. + * Thu May 28 2020 Susi Lehtola - 0.3.9-3 - Enable USE_LOCKING in the sequential versions of the library for thread safety. diff --git a/sources b/sources index 3587dc1..3d7fe4a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openblas-0.3.9.tar.gz) = e34da25b3aaf959ec12826ac68c81e739e453d44f2dba28b15e57d7a827edc4d5f42988e9b6d98ac07999940be7b5876246cb3a980e590ae87f77f4c2f12f40a +SHA512 (openblas-0.3.10.tar.gz) = 64a5f983b2f6e02cdb6e0f14433498cc5daa1ccfb49246f7a2dcd38f9982fa608f2abea069fe0e35012af8c1441c43d1f6418eaccd40795f5002fed1c36ce05d