diff --git a/blis.spec b/blis.spec index 35673a9..0b29c9c 100644 --- a/blis.spec +++ b/blis.spec @@ -20,7 +20,7 @@ Name: blis Version: 0.7.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: BLAS-like Library Instantiation Software Framework License: BSD URL: https://github.com/flame/blis @@ -29,6 +29,8 @@ 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 +# Don't identify s390x as 32-bit +Patch1: blis-s390x.patch BuildRequires: perl BuildRequires: %{?dts:devtoolset-%{?dts}-binutils devtoolset-%{?dts}-}gcc BuildRequires: /usr/bin/python3 gcc-gfortran chrpath @@ -131,6 +133,7 @@ BLIS architecture macros. # 0.6.0: removed bli_thread_get_env, bli_thread_init_rntm; indirect # sub-types in bli_addd_ex; ARCH enum in bli_arch_query_id. echo %sover | awk -F. '{printf("%s\n%s.%s\n", $2,$3,$4)}' >so_version +%patch1 -p1 %build @@ -139,6 +142,7 @@ case %_arch in x86_64) arch=x86_64 ;; # a57 runs on all aarch64 and the optimized micro-kernel should be a # better default than generic. +# Fixme: Include my changes for arm and ppc micro-arch dispatch. aarch64) arch=cortexa57 ;; armv7hl) arch=cortexa9 ;; # Similarly to aarch64 *) arch=generic ;; @@ -378,8 +382,11 @@ export LD_LIBRARY_PATH=`pwd`/serial/lib %{macrosdir}/macros.blis-srpm %changelog +* Wed Jul 1 2020 Dave Love - 0.7.0-3 +- Patch to build 64-, not 32-bit version on s390x (#1852549) + * Wed May 27 2020 Dave Love - 0.7.0-2 -- Revert build for arches that don't actually have had memkind packages +- Revert build for arches that don't actually have memkind packages * Wed May 20 2020 Dave Love - 0.7.0-1 - New version