CVS commit: pkgsrc/devel/xxhash

["Stephen Borrill" <sborrill%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sborrill
Date:           Thu Mar 31 15:36:08 UTC 2022

Modified Files:
        pkgsrc/devel/xxhash: distinfo
Added Files:
        pkgsrc/devel/xxhash/patches: patch-xxhash.h

Log Message:
xxhash: Fix build on C11 systems

Pull up patch from dev branch:
https://github.com/Cyan4973/xxHash/commit/6189ecd3d44a693460f86280ccf49d33cb4b18e1


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/xxhash/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/xxhash/patches/patch-xxhash.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/xxhash/distinfo
diff -u pkgsrc/devel/xxhash/distinfo:1.8 pkgsrc/devel/xxhash/distinfo:1.9
--- pkgsrc/devel/xxhash/distinfo:1.8    Thu Dec 16 16:49:41 2021
+++ pkgsrc/devel/xxhash/distinfo        Thu Mar 31 15:36:08 2022
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2021/12/16 16:49:41 adam Exp $
+$NetBSD: distinfo,v 1.9 2022/03/31 15:36:08 sborrill Exp $
 
 BLAKE2s (xxhash-0.8.1.tar.gz) = b12deeb6870753b0ed70b745142c64155252501b813ae0874d5df5a4ee2e677b
 SHA512 (xxhash-0.8.1.tar.gz) = 12feedd6a1859ef55e27218dbd6dcceccbb5a4da34cd80240d2f7d44cd246c7afdeb59830c2d5b90189bb5159293532208bf5bb622250102e12d6e1bad14a193
 Size (xxhash-0.8.1.tar.gz) = 171552 bytes
 SHA1 (patch-Makefile) = 05aec11dadf1a909e3aaa44d77dad9f42927b6b9
+SHA1 (patch-xxhash.h) = 7f1bf20961c7ec61a326a280277bf6fbf5deda1e

Added files:

Index: pkgsrc/devel/xxhash/patches/patch-xxhash.h
diff -u /dev/null pkgsrc/devel/xxhash/patches/patch-xxhash.h:1.1
--- /dev/null   Thu Mar 31 15:36:08 2022
+++ pkgsrc/devel/xxhash/patches/patch-xxhash.h  Thu Mar 31 15:36:08 2022
@@ -0,0 +1,21 @@
+$NetBSD: patch-xxhash.h,v 1.1 2022/03/31 15:36:08 sborrill Exp $
+
+No longer depend on `<assert.h>` for XXH_STATIC_ASSERT since some
+versions are buggy.
+
+Use `_Static_assert` instead, which is part of the C11 language.
+
+https://github.com/Cyan4973/xxHash/issues/671
+https://github.com/Cyan4973/xxHash/commit/6189ecd3d44a693460f86280ccf49d33cb4b18e1
+--- xxhash.h.orig      2021-11-29 12:34:10.000000000 -0600
++++ xxhash.h   2021-12-28 19:55:42.000000000 -0600
+@@ -1546,8 +1546,7 @@
+ /* note: use after variable declarations */
+ #ifndef XXH_STATIC_ASSERT
+ #  if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)    /* C11 */
+-#    include <assert.h>
+-#    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