From a43ef4358ef5e1f584a5daec5c01db9e3b071cbc0ec82958270f667d0c076111 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 14 Aug 2024 15:10:03 +0000 Subject: [PATCH 1/4] [info=886f7ca20986506a0ce975d3f4116af94f2638637d9e56e93997ede39e0add53] OBS-URL: https://build.opensuse.org/package/show/science/xxhash?expand=0&rev=28 --- .gitattributes | 23 ++++ .gitignore | 1 + _scmsync.obsinfo | 4 + baselibs.conf | 1 + build.specials.obscpio | 3 + test-tools-do-not-override-cflags.patch | 16 +++ xxHash-0.8.2.tar.gz | 3 + xxhash.changes | 159 ++++++++++++++++++++++++ xxhash.spec | 106 ++++++++++++++++ 9 files changed, 316 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 _scmsync.obsinfo create mode 100644 baselibs.conf create mode 100644 build.specials.obscpio create mode 100644 test-tools-do-not-override-cflags.patch create mode 100644 xxHash-0.8.2.tar.gz create mode 100644 xxhash.changes create mode 100644 xxhash.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo new file mode 100644 index 0000000..0928910 --- /dev/null +++ b/_scmsync.obsinfo @@ -0,0 +1,4 @@ +mtime: 1723648376 +commit: 886f7ca20986506a0ce975d3f4116af94f2638637d9e56e93997ede39e0add53 +url: https://src.opensuse.org/jengelh/xxhash +revision: master diff --git a/baselibs.conf b/baselibs.conf new file mode 100644 index 0000000..e4a7a4d --- /dev/null +++ b/baselibs.conf @@ -0,0 +1 @@ +libxxhash0 diff --git a/build.specials.obscpio b/build.specials.obscpio new file mode 100644 index 0000000..98a0160 --- /dev/null +++ b/build.specials.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca6c917c6f73cfe058cdfe749d68f47a05eb27431f24b2f3609db0871aa8cc43 +size 256 diff --git a/test-tools-do-not-override-cflags.patch b/test-tools-do-not-override-cflags.patch new file mode 100644 index 0000000..cf6250a --- /dev/null +++ b/test-tools-do-not-override-cflags.patch @@ -0,0 +1,16 @@ +From: Bruno Pitrus +Date: 2024-05-05 19:35:03+0000 + +--- xxHash-0.8.2/Makefile.old 2023-07-21 12:01:35.000000000 +0200 ++++ xxHash-0.8.2/Makefile 2024-05-05 21:19:32.265851133 +0200 +@@ -450,8 +450,8 @@ test-all: test test32 test-unicode clang + + .PHONY: test-tools + test-tools: +- CFLAGS=-Werror $(MAKE) -C tests/bench +- CFLAGS=-Werror $(MAKE) -C tests/collisions ++ $(MAKE) -C tests/bench ++ $(MAKE) -C tests/collisions + + .PHONY: test-xxh-nnn-sums + test-xxh-nnn-sums: xxhsum_and_links diff --git a/xxHash-0.8.2.tar.gz b/xxHash-0.8.2.tar.gz new file mode 100644 index 0000000..7a46e9e --- /dev/null +++ b/xxHash-0.8.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:baee0c6afd4f03165de7a4e67988d16f0f2b257b51d0e3cb91909302a26a79c4 +size 1141188 diff --git a/xxhash.changes b/xxhash.changes new file mode 100644 index 0000000..d8ee869 --- /dev/null +++ b/xxhash.changes @@ -0,0 +1,159 @@ +------------------------------------------------------------------- +Wed Aug 14 15:06:38 UTC 2024 - Jan Engelhardt + +- Build hwcap_libs (x86-64-v3) for xxhash, apparently there is + something to gain. + +------------------------------------------------------------------- +Sun May 5 19:35:03 UTC 2024 - Bruno Pitrus + +- Fix ftbfs with gcc14: + * use correct optflags also in %check + * add test-tools-do-not-override-cflags.patch +- Execute more tests + +------------------------------------------------------------------- +Thu Nov 30 14:43:11 UTC 2023 - Guillaume GARDET + +- Make use of openSUSE build flags + +------------------------------------------------------------------- +Fri Nov 3 10:00:32 UTC 2023 - Jan Engelhardt + +- Update to release 0.8.2 + * ARM NEON speed improvements; on M1 Pro it is +20% speed for + XXH3 and XXH128 (from 30.0 GB/s to 36 GB/s). + * Added support for ARM's SVE vector extension. + * Resolved some issues with XXH3's s390x vector implementation. +- Delete xxhash-avoid-armv6-unaligned-access.patch (should be + fixed by c0dd448b), delete 836f4e735cf368542f14005e41d2f84ec29dfd60.patch + (merged), delete 15ce80f9f2760609d8cc68cea76d3f3217ab70e1.patch + (merged) + +------------------------------------------------------------------- +Wed Mar 8 21:28:23 UTC 2023 - Michael Gorse + +- Add 15ce80f9f2760609d8cc68cea76d3f3217ab70e1.patch: fix build + failure on ppc64le when using gcc 7 (boo#1208794). + +------------------------------------------------------------------- +Mon Dec 20 10:27:32 UTC 2021 - Dirk Müller + +- fix racy check execution + +------------------------------------------------------------------- +Thu Dec 2 22:20:24 UTC 2021 - Dirk Müller + +- update to 0.8.1: + * perf : much improved performance for XXH3 streaming variants, notably on + gcc and msvc + * perf : improved XXH64 speed and latency on small inputs + * perf : small XXH32 speed and latency improvement on small inputs of random + size + * perf : minor stack usage improvement for XXH32 and XXH64 + * api : new experimental variants XXH3_*_withSecretandSeed() + * api : update XXH3_generateSecret(), can no generate secret of any size (>= + XXH3_SECRET_SIZE_MIN) + * cli : xxhsum can now generate and check XXH3 checksums, using command `-H3` + * build: can build xxhash without XXH3, with new build macro XXH_NO_XXH3 + * build: fix xxh_x86dispatch build with MSVC, by @apankrat + * build: XXH_INLINE_ALL can always be used safely, even after XXH_NAMESPACE + or a previous XXH_INLINE_ALL + * build: improved PPC64LE vector support + * install: fix pkgconfig + * install: compatibility with Haiku + * doc : code comments made compatible with doxygen + * misc : XXH_ACCEPT_NULL_INPUT_POINTER is no longer necessary, all functions + can accept NULL input pointers, as long as size == 0 + * misc : complete refactor of CI tests on Github Actions, offering much + larger coverage + * misc : xxhsum code base split into multiple specialized units, within + directory cli/ +- add 836f4e735cf368542f14005e41d2f84ec29dfd60.patch (fix manpage installation) + +------------------------------------------------------------------- +Tue Jul 6 17:15:34 CEST 2021 - ro@suse.de + +- add patch xxhash-avoid-armv6-unaligned-access.patch + do not expect unaligned accesses to work on armv6, it breaks + in our build setup using aarch64 kernels + +------------------------------------------------------------------- +Mon Aug 3 05:43:31 UTC 2020 - Ismail Dönmez + +- Update to version 0.8.0 + * api : stabilize XXH3 + * cli : xxhsum can produce BSD-style lines, with command --tag + * cli : xxhsum can parse and check BSD-style lines, using command --check + * cli : xxhsum - accepts console input + * cli : xxhsum accepts -- separator + * cli : fix : print correct default algo for symlinked helpers +- Add BR on c++_compiler, needed for test programs + +------------------------------------------------------------------- +Wed Dec 18 23:57:43 UTC 2019 - Stefan Brüns + +- Enable test suite run in %check + +------------------------------------------------------------------- +Tue Dec 17 13:17:59 UTC 2019 - Michał Rostecki + +- Update to version 0.7.2 + * Fixed collision ratio of XXH128 for some specific input lengths + * Improved VSX and NEON variants + * Improved performance of scalar code path (XXH_VECTOR=0), + * xxhsum: can generate 128-bit hash with command -H2 (note: for + experimental purposes only! XXH128 is not yet frozen) + * xxhsum: option -q removes status notifications + +------------------------------------------------------------------- +Thu Sep 26 10:06:43 UTC 2019 - simmphonie@opensuse.org + +- update to version 0.7.1 + - XXH3 updates: + * Secret first : the algorithm computation can be altered by + providing a "secret", which is any blob of bytes, of + size >= XXH3_SECRET_SIZE_MIN. + * seed is still available, and acts as a secret generator + * As a consequence of these changes, note that new return + values of XXH3 are not compatible with v0.7.0 + * updated ARM NEON variant + * Streaming implementation is available + * Improve compatibility and performance with Visual Studio + * Better integration when using XXH_INLINE_ALL : do not pollute + host namespace, use its own macros, such as XXH_ASSERT(), XXH_ALIGN, etc. + * 128-bits variant provide helper function, for comparison of hashes. + - general improvements: + * Better clang generation of rotl instruction + * XXH_REROLL build macro, to reduce binary size + * Improved cmake script + * Full benchmark program provided in /tests/bench + +- update to version 0.7.0 + - Add XXH3 hash algorithm + +------------------------------------------------------------------- +Thu Dec 6 09:25:19 UTC 2018 - Michał Rostecki + +- Remove false information from description - xxHash does not + derive from Argon2 algorithm. + +------------------------------------------------------------------- +Mon Dec 3 21:20:05 UTC 2018 - Jan Engelhardt + +- Trim bias from description + +------------------------------------------------------------------- +Tue Oct 16 20:10:06 UTC 2018 - t.gruner@katodev.de + +- update to version 0.6.5 + - Improved performance on small keys, thanks to suggestions from Jens Bauer + - New build macro, XXH_INLINE_ALL, extremely effective for small keys of fixed length (see this article for details) + - XXH32() : better performance on OS-X clang by disabling auto-vectorization + - Improved benchmark measurements accuracy on small keys + - Included xxHash specification document + +------------------------------------------------------------------- +Sun Jan 21 18:49:27 UTC 2018 - bugs@vdm-design.de + +- Initial package of version 0.6.4 diff --git a/xxhash.spec b/xxhash.spec new file mode 100644 index 0000000..1b9ece8 --- /dev/null +++ b/xxhash.spec @@ -0,0 +1,106 @@ +# +# spec file for package xxhash +# +# Copyright (c) 2024 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: xxhash +Version: 0.8.2 +Release: 0 +Summary: Non-cryptographic hash algorithm +License: BSD-2-Clause AND GPL-2.0-only +Group: Productivity/Security +URL: https://github.com/Cyan4973/xxHash +Source0: https://github.com/Cyan4973/xxHash/archive/v%{version}.tar.gz#/xxHash-%{version}.tar.gz +Source9: baselibs.conf +Patch1: test-tools-do-not-override-cflags.patch +BuildRequires: gcc-c++ +BuildRequires: pkg-config +%{?suse_build_hwcaps_libs} + +%description +xxHash is a hash algorithm. It completes the SMHasher test suite which +evaluates collision, dispersion and randomness qualities of hash functions. +Hashes are identical on all platforms. + +%package -n libxxhash0 +Summary: Non-cryptographic hash algorithm +License: BSD-2-Clause +Group: System/Libraries + +%description -n libxxhash0 +xxHash is a hash algorithm. It completes the SMHasher test suite which +evaluates collision, dispersion and randomness qualities of hash functions. +Hashes are identical on all platforms. + +%package devel +Summary: Headers for xxHash, a non-cryptographic hash algorithm +License: BSD-2-Clause +Group: Development/Libraries/C and C++ +Requires: %{name} = %{version} +Requires: libxxhash0 = %{version} + +%description devel +Headers and other development files for xxHash. + +%prep +%autosetup -p1 -n xxHash-%{version} + +%build +# ALLOW_AVX just means "we guarantee we policed our %%optflags". +export CFLAGS="%{optflags} -DXXH_X86DISPATCH_ALLOW_AVX=1" +export CXXFLAGS="$CFLAGS" +export LDFLAGS="%{?build_ldflags}" +%make_build prefix=%{_prefix} libdir=%{_libdir} + +%install +export CFLAGS="%{optflags} -DXXH_X86DISPATCH_ALLOW_AVX=1" +export CXXFLAGS="%{optflags}" +export LDFLAGS="%{?build_ldflags}" +%make_install prefix=%{_prefix} libdir=%{_libdir} +rm -rf %{buildroot}%{_libdir}/libxxhash.a + +%check +export CFLAGS="%{optflags}" +export CXXFLAGS="%{optflags}" +export LDFLAGS="%{?build_ldflags}" +# not safe for parallel execution as it removes xxhash.o and recreates it with different flags +# the list is taken from test-all with non-working/irrelevant ones (such as ones that change the toolchain) removed +%make_build -j1 test test-unicode listL120 trailingWhitespace test-xxh-nnn-sums + +%ldconfig_scriptlets -n libxxhash0 + +%files +%license LICENSE +%doc README.md +%{_bindir}/xxhsum +%{_bindir}/xxh32sum +%{_bindir}/xxh64sum +%{_bindir}/xxh128sum +%{_mandir}/man1/xxh32sum.* +%{_mandir}/man1/xxh64sum.* +%{_mandir}/man1/xxh128sum.* +%{_mandir}/man1/xxhsum.* + +%files -n libxxhash0 +%{_libdir}/libxxhash.so.* + +%files devel +%{_includedir}/xxhash.h +%{_includedir}/xxh3.h +%{_libdir}/pkgconfig/libxxhash.pc +%{_libdir}/libxxhash.so + +%changelog From 7623b5f8243d0a83d64e69af55903cbe5b70d2aac124c7ce4711ec1665290630 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 3 Sep 2024 02:03:34 +0000 Subject: [PATCH 2/4] [info=5fba8255783f21fed155cf8b2a5eadc0feedaff330f82ec91cb603b6ce3dc96f] OBS-URL: https://build.opensuse.org/package/show/science/xxhash?expand=0&rev=29 --- _scmsync.obsinfo | 4 ++-- baselibs.conf | 1 - build.specials.obscpio | 2 +- xxhash.changes | 6 ------ xxhash.spec | 5 ++++- 5 files changed, 7 insertions(+), 11 deletions(-) delete mode 100644 baselibs.conf diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 0928910..686f9cf 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1723648376 -commit: 886f7ca20986506a0ce975d3f4116af94f2638637d9e56e93997ede39e0add53 +mtime: 1725329284 +commit: 5fba8255783f21fed155cf8b2a5eadc0feedaff330f82ec91cb603b6ce3dc96f url: https://src.opensuse.org/jengelh/xxhash revision: master diff --git a/baselibs.conf b/baselibs.conf deleted file mode 100644 index e4a7a4d..0000000 --- a/baselibs.conf +++ /dev/null @@ -1 +0,0 @@ -libxxhash0 diff --git a/build.specials.obscpio b/build.specials.obscpio index 98a0160..e257e94 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca6c917c6f73cfe058cdfe749d68f47a05eb27431f24b2f3609db0871aa8cc43 +oid sha256:7ea3f22a197a086da848aea17613e1956657118eda79ea8b0dceef14e80608d3 size 256 diff --git a/xxhash.changes b/xxhash.changes index d8ee869..6ad13f8 100644 --- a/xxhash.changes +++ b/xxhash.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Wed Aug 14 15:06:38 UTC 2024 - Jan Engelhardt - -- Build hwcap_libs (x86-64-v3) for xxhash, apparently there is - something to gain. - ------------------------------------------------------------------- Sun May 5 19:35:03 UTC 2024 - Bruno Pitrus diff --git a/xxhash.spec b/xxhash.spec index 1b9ece8..09142bf 100644 --- a/xxhash.spec +++ b/xxhash.spec @@ -24,7 +24,6 @@ License: BSD-2-Clause AND GPL-2.0-only Group: Productivity/Security URL: https://github.com/Cyan4973/xxHash Source0: https://github.com/Cyan4973/xxHash/archive/v%{version}.tar.gz#/xxHash-%{version}.tar.gz -Source9: baselibs.conf Patch1: test-tools-do-not-override-cflags.patch BuildRequires: gcc-c++ BuildRequires: pkg-config @@ -63,6 +62,10 @@ Headers and other development files for xxHash. export CFLAGS="%{optflags} -DXXH_X86DISPATCH_ALLOW_AVX=1" export CXXFLAGS="$CFLAGS" export LDFLAGS="%{?build_ldflags}" +# DISPATCH=1 if you want AVX2/AVX512. But it does not seem to perform any +# better than the lowest-denomimation code on at least the 1135G7 and 5950X +# CPUs, and for both LP64 as well as ILP32 — it seems to be all within margin +# of error. %make_build prefix=%{_prefix} libdir=%{_libdir} %install From 948f2e707d272f70ffcaa689720360641fa7cf17b82edd6a2bb58c1b912ffbee Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 3 Sep 2024 02:07:34 +0000 Subject: [PATCH 3/4] [info=3bd4644eb4cc039acf4f003e2eaa821572bfe79d2d6408c91cf4538abf89deb1] OBS-URL: https://build.opensuse.org/package/show/science/xxhash?expand=0&rev=30 --- _scmsync.obsinfo | 4 ++-- build.specials.obscpio | 2 +- inline.patch | 30 ++++++++++++++++++++++++++++++ xxhash.changes | 5 +++++ xxhash.spec | 1 + 5 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 inline.patch diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 686f9cf..57e51d8 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1725329284 -commit: 5fba8255783f21fed155cf8b2a5eadc0feedaff330f82ec91cb603b6ce3dc96f +mtime: 1725329549 +commit: 3bd4644eb4cc039acf4f003e2eaa821572bfe79d2d6408c91cf4538abf89deb1 url: https://src.opensuse.org/jengelh/xxhash revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index e257e94..7bb4423 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ea3f22a197a086da848aea17613e1956657118eda79ea8b0dceef14e80608d3 +oid sha256:e1aa69055d3a58061819bcf39eb25d811d4ac371f93e530f18be5a4da4a1d279 size 256 diff --git a/inline.patch b/inline.patch new file mode 100644 index 0000000..4f927ae --- /dev/null +++ b/inline.patch @@ -0,0 +1,30 @@ +From: Jan Engelhardt +Date: + +Ditch forced inlining, gcc-14 does not like it on at least some arches (like riscv64): + +In function 'void XXH3_hashLong_internal_loop(xxh_u64*, const xxh_u8*, size_t, const xxh_u8*, size_t, XXH3_f_accumulate, XXH3_f_scrambleAcc)', + inlined from 'XXH_NAMESPACEXXH128_hash_t XXH3_hashLong_128b_internal(const void*, size_t, const xxh_u8*, size_t, XXH3_f_accumulate, XXH3_f_scrambleAcc)' at /usr/include/xxhash.h:6416:32, + inlined from 'XXH_NAMESPACEXXH128_hash_t XXH3_hashLong_128b_default(const void*, size_t, XXH64_hash_t, const void*, size_t)' at /usr/include/xxhash.h:6442:39: +/usr/include/xxhash.h:5364:18: error: inlining failed in call to 'always_inline' 'void XXH3_accumulate_scalar(xxh_u64*, const xxh_u8*, const xxh_u8*, size_t)': function not considered for inlining + 5364 | XXH_FORCE_INLINE XXH3_ACCUMULATE_TEMPLATE(scalar) +/usr/include/xxhash.h:5544:14: note: called from here + 5544 | f_acc(acc, input + n*block_len, secret, nbStripesPerBlock); + +--- + xxhash.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: xxHash-0.8.2/xxhash.h +=================================================================== +--- xxHash-0.8.2.orig/xxhash.h ++++ xxHash-0.8.2/xxhash.h +@@ -2107,7 +2107,7 @@ static void* XXH_memcpy(void* dest, cons + # define XXH_NO_INLINE static + /* enable inlining hints */ + #elif defined(__GNUC__) || defined(__clang__) +-# define XXH_FORCE_INLINE static __inline__ __attribute__((always_inline, unused)) ++# define XXH_FORCE_INLINE static __inline__ __attribute__((unused)) + # define XXH_NO_INLINE static __attribute__((noinline)) + #elif defined(_MSC_VER) /* Visual Studio */ + # define XXH_FORCE_INLINE static __forceinline diff --git a/xxhash.changes b/xxhash.changes index 6ad13f8..69540f6 100644 --- a/xxhash.changes +++ b/xxhash.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 3 02:11:09 UTC 2024 - Jan Engelhardt + +- Add inline.patch to resolve FTBFS on gcc14-riscv64 + ------------------------------------------------------------------- Sun May 5 19:35:03 UTC 2024 - Bruno Pitrus diff --git a/xxhash.spec b/xxhash.spec index 09142bf..a1bf827 100644 --- a/xxhash.spec +++ b/xxhash.spec @@ -25,6 +25,7 @@ Group: Productivity/Security URL: https://github.com/Cyan4973/xxHash Source0: https://github.com/Cyan4973/xxHash/archive/v%{version}.tar.gz#/xxHash-%{version}.tar.gz Patch1: test-tools-do-not-override-cflags.patch +Patch2: inline.patch BuildRequires: gcc-c++ BuildRequires: pkg-config %{?suse_build_hwcaps_libs} From afb7e34294bc90ab0fd59e56346fc9ac087d1a78ebae8c8face1f02e8f7079d8 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 4 Sep 2024 15:10:42 +0000 Subject: [PATCH 4/4] [info=679f82e202407e8aea6eb1514bbeb3f5024ded59fc3a4a33a1607268d40dbfb1] OBS-URL: https://build.opensuse.org/package/show/science/xxhash?expand=0&rev=31 --- _scmsync.obsinfo | 4 ++-- build.specials.obscpio | 2 +- inline.patch | 6 ++++-- xxhash.changes | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 57e51d8..19ca1e6 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1725329549 -commit: 3bd4644eb4cc039acf4f003e2eaa821572bfe79d2d6408c91cf4538abf89deb1 +mtime: 1725462627 +commit: 679f82e202407e8aea6eb1514bbeb3f5024ded59fc3a4a33a1607268d40dbfb1 url: https://src.opensuse.org/jengelh/xxhash revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index 7bb4423..7020f7a 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1aa69055d3a58061819bcf39eb25d811d4ac371f93e530f18be5a4da4a1d279 +oid sha256:9974f310c9154693e3b5c5b8086a7ee66f9dfcbc4ecd446fd795841b8955c242 size 256 diff --git a/inline.patch b/inline.patch index 4f927ae..17111e2 100644 --- a/inline.patch +++ b/inline.patch @@ -1,7 +1,9 @@ From: Jan Engelhardt -Date: +Date: 2024-09-04 17:08:46.573623857 +0200 +References: https://github.com/Cyan4973/xxHash/issues/943 -Ditch forced inlining, gcc-14 does not like it on at least some arches (like riscv64): +Ditch forced inlining, gcc-14 does not like it when combined with -Og. +(gcc-13 was fine.) And I want everyone to be able to use -Og. In function 'void XXH3_hashLong_internal_loop(xxh_u64*, const xxh_u8*, size_t, const xxh_u8*, size_t, XXH3_f_accumulate, XXH3_f_scrambleAcc)', inlined from 'XXH_NAMESPACEXXH128_hash_t XXH3_hashLong_128b_internal(const void*, size_t, const xxh_u8*, size_t, XXH3_f_accumulate, XXH3_f_scrambleAcc)' at /usr/include/xxhash.h:6416:32, diff --git a/xxhash.changes b/xxhash.changes index 69540f6..4eecbe6 100644 --- a/xxhash.changes +++ b/xxhash.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Tue Sep 3 02:11:09 UTC 2024 - Jan Engelhardt -- Add inline.patch to resolve FTBFS on gcc14-riscv64 +- Add inline.patch to resolve FTBFS on gcc-14 + -Og. ------------------------------------------------------------------- Sun May 5 19:35:03 UTC 2024 - Bruno Pitrus