Merge commit '1be53a078749b6a6c243fb499694a79a0d2ad449' into main-riscv64

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
David Abdurachmanov 2024-01-26 12:48:14 +02:00
commit b43a44cb8d
Signed by: davidlt
GPG Key ID: 7A5F42FAF91FACC3
2 changed files with 10 additions and 5 deletions

View File

@ -1 +1 @@
SHA512 (zlib-ng-2.1.5.tar.gz) = 9212d87c63a2da4e5355a7a1c75380aeba40fbd0ea3d71d3784cb3eac94237f9bea2a1b7993a08f39d4197725c4c133087d3a9d213d3944aa48a7559de2be920
SHA512 (zlib-ng-2.1.6.tar.gz) = 59ef586c09b9a63788475abfd6dd59ed602316b38f543f801bea802ff8bec8b55a89bee90375b8bbffa3bdebc7d92a00903f4b7c94cdc1a53a36e2e1fd71d13a

View File

@ -18,8 +18,8 @@
%global supported_abi_test aarch64 ppc64le x86_64
Name: zlib-ng
Version: 2.1.5
Release: 2.0.riscv64%{?dist}
Version: 2.1.6
Release: 1.0.riscv64%{?dist}
Summary: Zlib replacement with optimizations
License: zlib
Url: https://github.com/zlib-ng/zlib-ng
@ -98,7 +98,7 @@ cat <<_EOF_
_EOF_
# zlib-ng uses a different macro for library directory.
%global cmake_param %{?with_sanitizers:-DWITH_SANITIZER=ON} -DINSTALL_LIB_DIR=%{_libdir} -DWITH_RVV=OFF
%global cmake_param %{?with_sanitizers:-DWITH_SANITIZER=ON} -DWITH_RVV=OFF
# Setting __cmake_builddir is not necessary in this step, but do it anyway for symmetry.
%global __cmake_builddir %{_vpath_builddir}
@ -189,6 +189,7 @@ CHOST=%{target_cpu}-%{vendor}-linux-gnu sh test/abicheck.sh --zlib-compat
%{_includedir}/zlib_name_mangling-ng.h
%{_libdir}/libz-ng.so
%{_libdir}/pkgconfig/%{name}.pc
%{_libdir}/cmake/zlib-ng/*
%if %{with compat}
@ -202,6 +203,7 @@ CHOST=%{target_cpu}-%{vendor}-linux-gnu sh test/abicheck.sh --zlib-compat
%{_includedir}/zlib_name_mangling.h
%{_libdir}/libz.so
%{_libdir}/pkgconfig/zlib.pc
%{_libdir}/cmake/ZLIB/*
%files compat-static
%{_libdir}/libz.a
@ -211,10 +213,13 @@ CHOST=%{target_cpu}-%{vendor}-linux-gnu sh test/abicheck.sh --zlib-compat
%changelog
* Thu Jan 11 2023 David Abdurachmanov <davidlt@rivosinc.com> - 2.1.5-1.1.riscv64
* Fri Jan 26 2024 David Abdurachmanov <davidlt@rivosinc.com> - 2.1.6-1.0.riscv64
- Disable RVV (Vector) on riscv64
- Enable riscv64
* Thu Jan 11 2024 Lukas Javorsky <ljavorsk@redhat.com> - 2.1.6-1
- Rebase to version 2.1.6
* Tue Jan 09 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 2.1.5-2
- Add zlib-ng-compat-static to replace zlib-static