testing/zlib
SHA256
3
0
Fork 0
forked from pool/zlib
Code Pull Requests Activity

Accepting request 708284 from devel:libraries:c_c++

Browse Source 
- Do not enable the previous patchset on s390 but just s390x
  bsc#1137624

- Add patchset for s390 improvements jsc#SLE-5807 bsc#1136717:
  * 410.patch

OBS-URL: https://build.opensuse.org/request/show/708284
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zlib?expand=0&rev=70
This commit is contained in:
Dominique Leuenberger 2019-06-26 13:59:01 +00:00 committed by Git OBS Bridge
commit 62e5294096
3 changed files with 1707 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1682
410.patch Normal file
View File

File diff suppressed because it is too large Load Diff

12
zlib.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Jun 7 11:24:35 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- Do not enable the previous patchset on s390 but just s390x
bsc#1137624
-------------------------------------------------------------------
Thu Jun 6 09:43:12 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- Add patchset for s390 improvements jsc#SLE-5807 bsc#1136717:
* 410.patch
-------------------------------------------------------------------
Tue Mar 19 14:11:48 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>

17
zlib.spec
View File

@ -37,6 +37,8 @@ Patch1: zlib-format.patch
Patch2: 0001-Do-not-try-to-store-negative-values-in-unsigned-int.patch
#PATCH-FIX-UPSTREAM https://github.com/madler/zlib/pull/335
Patch3: zlib-power8-fate325307.patch
#PATCH-FIX-UPSTREAM https://github.com/madler/zlib/pull/410
Patch4: 410.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
@ -121,10 +123,17 @@ developing applications which use minizip.
%patch1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build
export LDFLAGS="-Wl,-z,relro,-z,now"
%ifarch s390x
export CFLAGS="%{optflags} -DDFLTCC"
%define addopts OBJA=dfltcc.o PIC_OBJA=dfltcc.lo
%else
export CFLAGS="%{optflags}"
%define addopts %{nil}
%endif
# For sure not autotools build
CC="cc" ./configure \
--shared \
@ -132,12 +141,12 @@ CC="cc" ./configure \
--libdir=/%{_lib}
%if %{do_profiling}
make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_generate}"
make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_generate}" %{addopts}
make check %{?_smp_mflags}
make clean
make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_feedback}"
make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_feedback}" %{addopts}
%else
make %{?_smp_mflags}
make %{?_smp_mflags} %{addopts}
%endif
# And build minizip
@ -146,7 +155,7 @@ autoreconf -fvi
%configure \
--disable-static \
--disable-silent-rules
make %{?_smp_mflags}
make %{?_smp_mflags} %{addopts}
%check
make check %{?_smp_mflags}