Compare commits

..

12 Commits

Author SHA1 Message Date
Pádraig Brady eb0f7b0f31 latest upstream (1.5.4) 2023-02-13 14:59:02 +00:00
Pádraig Brady ab7f0275c7 latest upstream (1.5.2) 2022-01-23 16:22:24 +00:00
Pádraig Brady baf5c1f41a fix prefix in generated pkgconfig file
This is now generated at build, rather than install time

Addresses https://bugzilla.redhat.com/2036667
2022-01-03 17:35:34 +00:00
Pádraig Brady 97ac083558 remove informational execstack call
prelink or execstack packages are not generally available.
prelink seems missing on ppc64le at least.
2021-12-29 23:54:06 +00:00
Pádraig Brady 57da3a54e2 avoid executable stack on i686 also 2021-12-29 21:41:49 +00:00
Pádraig Brady 8cf8358742 use prelink rather than execstack
required on <= f22 (even though execstack package available in epel)
2021-12-29 02:55:53 +00:00
Zbigniew Jędrzejewski-Szmek 25138c2423 Bump release 2021-12-29 01:34:18 +00:00
Zbigniew Jędrzejewski-Szmek 1da1913cc1 Disable amd64 assembly on non-intel architectures
All builds would include an .S file which contains a pre-processor
directive that makes the file effectively empty on non-amd64
architectures. Objects built from assembly get an executable stack by
default. The file has a stanza to make the stack non-executable, but
on non-amd64 architectures this stanza is skipped together with the
rest of the file. Nevertheless, it seems that even the empty file
causes an executable stack to be created. To avoid the issue, do a
build with the assembler file explicitly skipped.
2021-12-29 01:34:08 +00:00
Pádraig Brady f9fafbbc38 latest upstream (1.5.1) 2021-12-23 00:26:38 +00:00
Pádraig Brady bd5bfb5d25 latest upstream (1.5.0) 2021-05-16 20:58:13 +01:00
Pádraig Brady 66c011b413 latest upstream (1.4.9) 2021-03-05 13:49:07 +00:00
Pádraig Brady 196d817011 latest upstream (1.4.7)
Also include fix for test failure on i686 and s390
https://github.com/facebook/zstd/pull/2432
2020-12-18 16:04:15 +00:00
1 changed files with 20 additions and 64 deletions

View File

@ -1,17 +1,18 @@
# enable asm implementations by default
%bcond_without asm
# enable .lz4 support by default
%bcond_without lz4
# enable .xz/.lzma support by default
%bcond_without lzma
# enable .gz support by default
%bcond_without zlib
# enable pzstd support by default
%if 0%{?rhel} && 0%{?rhel} <= 6
# gcc-4.4 is currently too old to compile pzstd
%bcond_with pzstd
%else
%ifarch %{ix86} x86_64
%bcond_without pzstd
%else
# aarch64 and armv7hl at least currently segfault
# in ThreadPool test for the pzstd util
%bcond_with pzstd
%endif
%endif
# Support disabling ASM implementations
%bcond_without asm
Name: zstd
Version: 1.5.4
@ -24,21 +25,10 @@ Source0: https://github.com/facebook/zstd/archive/v%{version}.tar.gz#/%{n
Patch1: pzstd.1.patch
BuildRequires: make
BuildRequires: gcc gtest-devel
%if %{with lz4}
BuildRequires: lz4-devel
%endif
%if %{with lzma}
BuildRequires: xz-devel
%endif
%if %{with pzstd}
BuildRequires: gcc-c++
%endif
%if %{with zlib}
BuildRequires: zlib-devel
%endif
BuildRequires: execstack
%description
Zstd, short for Zstandard, is a fast lossless compression algorithm,
@ -76,21 +66,20 @@ export CFLAGS="$RPM_OPT_FLAGS"
export LDFLAGS="$RPM_LD_FLAGS"
export PREFIX="%{_prefix}"
export LIBDIR="%{_libdir}"
%make_build -C lib lib-mt %{!?with_asm:ZSTD_NO_ASM=1}
%make_build -C programs %{!?with_asm:ZSTD_NO_ASM=1}
for dir in lib programs; do
%make_build -C "$dir" %{!?with_asm:ZSTD_NO_ASM=1}
done
%if %{with pzstd}
export CXXFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS -std=c++11"
%make_build -C contrib/pzstd %{!?with_asm:ZSTD_NO_ASM=1}
%endif
%check
execstack lib/libzstd.so.1
export CFLAGS="$RPM_OPT_FLAGS"
export LDFLAGS="$RPM_LD_FLAGS"
make -C tests test-zstd
%if %{with pzstd}
export CXXFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS -std=c++11"
make -C contrib/pzstd test
%endif
@ -140,27 +129,9 @@ install -D -m644 programs/%{name}.1 %{buildroot}%{_mandir}/man1/p%{name}.1
* Mon Feb 13 2023 Pádraig Brady <P@draigBrady.com> - 1.5.4-1
- Latest upstream
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu May 19 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 1.5.2-2
- ThreadPool segfault fixed so build pzst everywhere
* Sat Jan 22 2022 Pádraig Brady <P@draigBrady.com> - 1.5.2-1
- Latest upstream
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Jan 11 2022 Pádraig Brady <P@draigBrady.com> - 1.5.1-6
- Re-enable CET protections (#2039353)
* Fri Jan 07 2022 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.5.1-5
- Enable gz, .xz/.lzma and .lz4 support
* Mon Jan 03 2022 Pádraig Brady <P@draigBrady.com> - 1.5.1-4
- Use correct prefix for pkgconfig.
@ -174,30 +145,15 @@ install -D -m644 programs/%{name}.1 %{buildroot}%{_mandir}/man1/p%{name}.1
* Wed Dec 22 2021 Pádraig Brady <P@draigBrady.com> - 1.5.1-1
- Latest upstream
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Sun May 16 2021 Pádraig Brady <P@draigBrady.com> - 1.5.0-2
* Sun May 16 2021 Pádraig Brady <P@draigBrady.com> - 1.5.0-1
- Latest upstream
* Fri Mar 05 2021 Pádraig Brady <P@draigBrady.com> - 1.4.9-1
- Latest upstream
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Thu Dec 17 2020 Pádraig Brady <P@draigBrady.com> - 1.4.7-1
- Latest upstream
* Wed Aug 26 2020 Jeff Law <law@redhat.com> - 1.4.5-6
- Do not force C++11 mode
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.5-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Sat Jul 11 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 1.4.5-4
- Build libzstd with multi-threading support
* Mon May 25 2020 Pádraig Brady <P@draigBrady.com> - 1.4.5-3
- Build shared library with correct compiler flags