From 6e518c47dd6a16d0dee66b208d365728453cc655 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 5 Jan 2022 19:07:51 +0100 Subject: [PATCH] package/xxhash: fix uclibc build Fix the following uclibc build failure raised since bump to version 0.8.1 in commit 5dbdb2535c649ee617595b8c4ae3cbba0ee37b97: /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblazeel-buildroot-linux-uclibc/10.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: xxhash.o: in function `XXH3_hashLong_128b_internal.constprop.0': (.text+0xcbc): undefined reference to `static_assert' Fixes: - http://autobuild.buildroot.org/results/559/5595b21a711b482b84e582fc9f56e5468c9eb6d6/build-end.log Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...nd-on-assert-h-for-XXH_STATIC_ASSERT.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch diff --git a/package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch b/package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch new file mode 100644 index 0000000000..3b65ae1d6c --- /dev/null +++ b/package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch @@ -0,0 +1,29 @@ +From 6189ecd3d44a693460f86280ccf49d33cb4b18e1 Mon Sep 17 00:00:00 2001 +From: Yann Collet +Date: Sun, 26 Dec 2021 15:15:26 -0800 +Subject: [PATCH] do no longer depend on `` for XXH_STATIC_ASSERT + +since some versions are buggy. + +Use `_Static_assert` instead, which is part of the C11 language. +[Retrieved from: +https://github.com/Cyan4973/xxHash/commit/6189ecd3d44a693460f86280ccf49d33cb4b18e1] +Signed-off-by: Fabrice Fontaine +--- + xxhash.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/xxhash.h b/xxhash.h +index 311a69c7..5dfd5c45 100644 +--- a/xxhash.h ++++ b/xxhash.h +@@ -1749,8 +1749,7 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) + /* note: use after variable declarations */ + #ifndef XXH_STATIC_ASSERT + # if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */ +-# include +-# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) ++# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { _Static_assert((c),m); } while(0) + # elif defined(__cplusplus) && (__cplusplus >= 201103L) /* C++11 */ + # define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) + # else