From 23767aa2d23c5018680a3cc00e73e5f7ac6e22cf Mon Sep 17 00:00:00 2001 From: Dave Love Date: Jun 04 2019 11:25:57 +0000 Subject: - New version --- diff --git a/.gitignore b/.gitignore index 4b454a6..dda068e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /blis-0.4.1.tar.gz /blis-0.5.0.tar.gz /blis-0.5.1.tar.gz +/blis-0.6.0.tar.gz diff --git a/0001-Allow-running-configure-with-python-3.4.patch b/0001-Allow-running-configure-with-python-3.4.patch deleted file mode 100644 index e742160..0000000 --- a/0001-Allow-running-configure-with-python-3.4.patch +++ /dev/null @@ -1,67 +0,0 @@ -From daacfe68404c9cc8078e5e7ba49a8c7d93e8cda3 Mon Sep 17 00:00:00 2001 -From: "Field G. Van Zee" -Date: Mon, 7 Jan 2019 12:12:47 -0600 -Subject: [PATCH] Allow running configure with python 3.4. - -Details: -- Relax version blacklisting of python3 to allow 3.4 or later instead - of 3.5 or later. Thanks to Dave Love for pointing out that 3.4 was - sufficient for the purpose of BLIS's build system. (It should be - noted that we're not sure which, if any, python3 versions prior to - 3.4 are insufficient, and that the only thing stopping us from - determining this is the fact that these earlier versions of python3 - are not readily available for us to test with.) -- Updated docs/BuildSystem.md to be explicit about current python2 vs - python3 version requirements. ---- - configure | 12 +++++++++--- - docs/BuildSystem.md | 2 +- - 2 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/configure b/configure -index 093caca0..2d98dc32 100755 ---- a/configure -+++ b/configure -@@ -1214,7 +1214,13 @@ check_python() - # - # python1: no versions supported - # python2: 2.7+ -- # python3: 3.5+ -+ # python3: 3.4+ -+ # -+ # NOTE: It's actually unclear whether python 3.0 through 3.3.x would work. -+ # Python 3.5 is the oldest python3 that I have available to test with, and -+ # I only know that 3.4 will work thanks to feedback from Dave Love. So it's -+ # quite possible that some of those "unsupported" python3 versions are -+ # sufficient. -FGVZ - # - - # Python 1.x is unsupported. -@@ -1229,9 +1235,9 @@ check_python() - fi - fi - -- # Python 3.4.x or older is unsupported. -+ # Python 3.3.x or older is unsupported. - if [ ${python_major} -eq 3 ]; then -- if [ ${python_minor} -lt 5 ]; then -+ if [ ${python_minor} -lt 4 ]; then - echoerr_unsupportedpython - fi - fi -diff --git a/docs/BuildSystem.md b/docs/BuildSystem.md -index 301f8e02..84004f88 100644 ---- a/docs/BuildSystem.md -+++ b/docs/BuildSystem.md -@@ -20,7 +20,7 @@ This document describes how to configure, compile, and install a BLIS library on - - The BLIS build system was designed for use with GNU/Linux (or some other sane UNIX). Other requirements are: - -- * Python (2.7 or later) -+ * Python (2.7 or later for python2; 3.4 or later for python3) - * GNU `bash` (3.2 or later) - * GNU `make` (3.81 or later) - * a working C99 compiler --- -2.11.0 - diff --git a/blis.spec b/blis.spec index 629df53..3d0dc80 100644 --- a/blis.spec +++ b/blis.spec @@ -1,13 +1,6 @@ # Copyright (C) 2018 Dave love, University of Manchester # Licence as for the package source -%global gitver %nil -%if 0 -%global commit 01c4173238baf08e7f6700a3f91a2ea58cca50c1 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global gitver .git%shortcommit -%endif - # The full tests are very time-consuming %bcond_with fulltest @@ -27,8 +20,8 @@ %undefine _ld_as_needed Name: blis -Version: 0.5.1 -Release: 2%gitver%{?dist} +Version: 0.6.0 +Release: 1%{?dist} Summary: BLAS-like Library Instantiation Software Framework License: BSD URL: https://github.com/flame/blis @@ -37,13 +30,12 @@ Source0: https://github.com/flame/blis/archive/%commit/%name-%shortcommit.tar.gz %else Source0: https://github.com/flame/blis/archive/%version/%name-%version.tar.gz %endif -# Relevant for el6/7 rebuilds (from upstream) -Patch1: 0001-Allow-running-configure-with-python-3.4.patch BuildRequires: perl BuildRequires: %{?dts6:devtoolset-6-binutils devtoolset-6-}gcc BuildRequires: /usr/bin/python3 gcc-gfortran chrpath # memkind is currently only relevant for KNL, but might be relevant in -# future for other targets with HBM. +# future for other targets with HBM. The latest version also has +# ppc64le support, but that's not in Fedora. %ifarch x86_64 %{!?el6:BuildRequires: memkind-devel} %endif @@ -134,9 +126,6 @@ BLIS architecture macros. %prep %setup -q %{?commit: -n %name-%commit} -%if 0%{?el6}%{?el7} -%patch1 -p1 -%endif %build @@ -381,6 +370,9 @@ export LD_LIBRARY_PATH=`pwd`/serial/lib %{macrosdir}/macros.blis-srpm %changelog +* Tue Jun 4 2019 Dave Love - 0.6.0-1 +- New version + * Thu Feb 14 2019 Dave Love - 0.5.1-2 - Allow rebuilding for EPEL - This version fixes #1674701 diff --git a/sources b/sources index 5868fde..ddfc42e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (blis-0.5.1.tar.gz) = 15e8596783900e7430c5fedf5acfa4620a6cb0017905013e000df2bf708db6177cc2939f0299eb960d784add23a8195cbd69cd2450e7980272c5c65d3d360739 +SHA512 (blis-0.6.0.tar.gz) = 74e9da5146f7986cbd11651d7cd0837562a1603c667b9e6d3f79b5057443de657b60d7463cb2d64daf3eff7d33fc05a64e6d8eb807f4cabe0c3121517924a206