From 700aa1033774e6acee372f2c9e4a6ea0652abe38 Mon Sep 17 00:00:00 2001 From: Ondrej Dubaj Date: Tue, 29 Oct 2019 13:30:42 +0100 Subject: [PATCH] Added -DDFLTCC parameter to configure to enable Z hardware-accelerated deflate for s390x architectures --- zlib.spec | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/zlib.spec b/zlib.spec index 327915a..0f4e08c 100644 --- a/zlib.spec +++ b/zlib.spec @@ -2,7 +2,7 @@ Name: zlib Version: 1.2.11 -Release: 19%{?dist} +Release: 20%{?dist} Summary: The compression and decompression library # /contrib/dotzlib/ have Boost license License: zlib and Boost @@ -102,11 +102,19 @@ CFLAGS+=" -O3" %ifarch aarch64 CFLAGS+=" -DARM_NEON -O3" %endif +%ifarch s390 s390x +CFLAGS+=" -DDFLTCC" +%endif + +export MKFLAGS="" +%ifarch s390 s390x +MKFLAGS+="OBJA=dfltcc.o PIC_OBJA=dfltcc.lo" +%endif export LDFLAGS="$LDFLAGS -Wl,-z,relro -Wl,-z,now" # no-autotools, %%configure is not compatible ./configure --libdir=%{_libdir} --includedir=%{_includedir} --prefix=%{_prefix} -%make_build +%make_build $MKFLAGS %if %{with minizip} cd contrib/minizip @@ -167,6 +175,10 @@ find $RPM_BUILD_ROOT -name '*.la' -delete %changelog +* Tue Oct 29 2019 Ondrej Dubaj - 1.2.11-20 +- Added -DDFLTCC parameter to configure to enable +- Z hardware-accelerated deflate for s390x architectures + * Thu Sep 05 2019 Ondrej Dubaj - 1.2.11-19 - IBM CRC32 optimalization for POWER 8+ architectures re-add - fixed firefox crash duer to zlib (#1741266)