Bring xxhash-libs back

XXH_INLINE_ALL is not always reliable and we may still need the DSO to
link against, so don't aggressively drop the libs.

Resolves: RHEL-74131
This commit is contained in:
Siddhesh Poyarekar 2025-01-23 20:12:03 -05:00 committed by Siddhesh Poyarekar
parent b958d52363
commit dd81578a74

View File

@ -1,13 +1,6 @@
# Disable xxhash-libs in RHEL10 or later.
%if 0%{?fedora} > 0 || 0%{?rhel} < 10
%global build_xxhash_libs 1
%else
%global build_xxhash_libs 0
%endif
Name: xxhash
Version: 0.8.2
Release: 10%{?dist}
Release: 11%{?dist}
Summary: Extremely fast hash algorithm
# The source for the library (xxhash.c and xxhash.h) is BSD-2-Clause
@ -27,8 +20,6 @@ evaluates collision, dispersion and randomness qualities of hash
functions. Code is highly portable, and hashes are identical on all
platforms (little / big endian).
%if %{build_xxhash_libs}
%package libs
Summary: Extremely fast hash algorithm - library
License: BSD-2-Clause
@ -40,14 +31,10 @@ evaluates collision, dispersion and randomness qualities of hash
functions. Code is highly portable, and hashes are identical on all
platforms (little / big endian).
%endif
%package devel
Summary: Extremely fast hash algorithm - development files
License: BSD-2-Clause
%if %{build_xxhash_libs}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%endif
# By setting XXH_INLINE_ALL, xxhash may be used as a header-only library.
# Dependent packages that use xxhash this way must BR this virtual Provide:
Provides: %{name}-static = %{version}-%{release}
@ -86,17 +73,12 @@ doxygen
%install
%make_install PREFIX=%{_prefix} LIBDIR=%{_libdir}
rm %{buildroot}/%{_libdir}/libxxhash.a
%if %{build_xxhash_libs} == 0
rm %{buildroot}/%{_libdir}/libxxhash.so*
%endif
%check
make check
make test-xxhsum-c
%if %{build_xxhash_libs}
%ldconfig_scriptlets libs
%endif
%files
%{_bindir}/xxh*sum
@ -104,25 +86,24 @@ make test-xxhsum-c
%license cli/COPYING
%doc cli/README.md
%if %{build_xxhash_libs}
%files libs
%{_libdir}/libxxhash.so.*
%license LICENSE
%doc README.md
%endif
%files devel
%{_includedir}/xxhash.h
%{_includedir}/xxh3.h
%if %{build_xxhash_libs}
%{_libdir}/libxxhash.so
%endif
%{_libdir}/pkgconfig/libxxhash.pc
%files doc
%doc doxygen/html
%changelog
* Thu Jan 23 2025 Siddhesh Poyarekar <siddhesh@redhat.com> - 0.8.2-11
- Bring xxhash-libs back (RHEL-74131).
* Mon Jan 13 2025 Siddhesh Poyarekar <siddhesh@redhat.com> - 0.8.2-10
- Rebuild to tag xxhash into buildroot (RHEL-71299).