CVS commit: pkgsrc/textproc/libunistring

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Jun 11 00:59:28 UTC 2023

Modified Files:
        pkgsrc/textproc/libunistring: distinfo
Added Files:
        pkgsrc/textproc/libunistring/patches: patch-config.h.in
            patch-gnulib-m4_assert__h.m4

Log Message:
Borrow upstream gnulib commit 0814a293 to fix static_assert on
Solaris 11.4.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/textproc/libunistring/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/libunistring/patches/patch-config.h.in \
    pkgsrc/textproc/libunistring/patches/patch-gnulib-m4_assert__h.m4

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

Modified files:

Index: pkgsrc/textproc/libunistring/distinfo
diff -u pkgsrc/textproc/libunistring/distinfo:1.14 pkgsrc/textproc/libunistring/distinfo:1.15
--- pkgsrc/textproc/libunistring/distinfo:1.14  Mon Oct 24 13:57:24 2022
+++ pkgsrc/textproc/libunistring/distinfo       Sun Jun 11 00:59:27 2023
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.14 2022/10/24 13:57:24 wiz Exp $
+$NetBSD: distinfo,v 1.15 2023/06/11 00:59:27 schmonz Exp $
 
 BLAKE2s (libunistring-1.1.tar.gz) = f12c729f0f4b7ffd2e47e409b27ad9b7738c1245ad7139f2aa84ae9a4cb5066c
 SHA512 (libunistring-1.1.tar.gz) = 9cb1acc8b39096f30e77ad2f4c6127c3ff01588dbf41389ff294e9b89616d54d6a76cad5748f8dcb70b78ec28100fc1272d4eb9e6527b52e89a1ecac25b43647
 Size (libunistring-1.1.tar.gz) = 4272875 bytes
+SHA1 (patch-config.h.in) = bffe6cab9cbf11beb112b2af3d4c860e24d02782
+SHA1 (patch-gnulib-m4_assert__h.m4) = 51f0658dc7e6124ac8fa235b3b21703f9a77713f
 SHA1 (patch-lib_Makefile.in) = f2335fa6a8b088e701a4d8bd433b45359be5c243
 SHA1 (patch-lib_stdbool.mini.h) = 0b4a3b3e461b517f28e9a58da0f50045467d2d2a

Added files:

Index: pkgsrc/textproc/libunistring/patches/patch-config.h.in
diff -u /dev/null pkgsrc/textproc/libunistring/patches/patch-config.h.in:1.1
--- /dev/null   Sun Jun 11 00:59:28 2023
+++ pkgsrc/textproc/libunistring/patches/patch-config.h.in      Sun Jun 11 00:59:27 2023
@@ -0,0 +1,18 @@
+$NetBSD: patch-config.h.in,v 1.1 2023/06/11 00:59:27 schmonz Exp $
+
+Borrow upstream gnulib commit 0814a293:
+Make static_assert work on Solaris 11.4.
+
+--- config.h.in.orig   2022-10-16 20:23:50.000000000 +0000
++++ config.h.in
+@@ -2298,4 +2298,10 @@
+              && __GNUG__ < 6 && __clang_major__ < 6)))
+  #include <assert.h>
+  #undef/**/assert
++ /* Solaris 11.4 <assert.h> defines static_assert as a macro with 2 arguments.
++    We need it also to be invocable with a single argument.  */
++ #if defined __sun && (__STDC_VERSION__ - 0 >= 201112L) && !defined __cplusplus
++  #undef static_assert
++  #define static_assert _Static_assert
++ #endif
+ #endif
Index: pkgsrc/textproc/libunistring/patches/patch-gnulib-m4_assert__h.m4
diff -u /dev/null pkgsrc/textproc/libunistring/patches/patch-gnulib-m4_assert__h.m4:1.1
--- /dev/null   Sun Jun 11 00:59:28 2023
+++ pkgsrc/textproc/libunistring/patches/patch-gnulib-m4_assert__h.m4   Sun Jun 11 00:59:27 2023
@@ -0,0 +1,19 @@
+$NetBSD: patch-gnulib-m4_assert__h.m4,v 1.1 2023/06/11 00:59:27 schmonz Exp $
+
+Borrow upstream gnulib commit 0814a293:
+Make static_assert work on Solaris 11.4.
+
+--- gnulib-m4/assert_h.m4.orig 2022-10-15 19:19:56.000000000 +0000
++++ gnulib-m4/assert_h.m4
+@@ -57,5 +57,11 @@ AC_DEFUN([gl_ASSERT_H],
+              && __GNUG__ < 6 && __clang_major__ < 6)))
+  #include <assert.h>
+  #undef/**/assert
++ /* Solaris 11.4 <assert.h> defines static_assert as a macro with 2 arguments.
++    We need it also to be invocable with a single argument.  */
++ #if defined __sun && (__STDC_VERSION__ - 0 >= 201112L) && !defined __cplusplus
++  #undef static_assert
++  #define static_assert _Static_assert
++ #endif
+ #endif])
+ ])