[pkgsrc/trunk]: pkgsrc/textproc/libunistring libunistring: Test for c99 inste...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3c8405892638
branches:  trunk
changeset: 769323:3c8405892638
user:      nia <nia%pkgsrc.org@localhost>
date:      Fri Nov 12 12:40:17 2021 +0000

description:
libunistring: Test for c99 instead of testing for the compiler before
attempting to include stdbool.h. Solaris 10 has stdbool, but the compiler
defaults to c89 and an error will occur on stdbool inclusion due to the
specified standard not being recent enough.

PR pkg/56488

diffstat:

 textproc/libunistring/Makefile                         |   3 +-
 textproc/libunistring/distinfo                         |   4 ++-
 textproc/libunistring/patches/patch-lib_Makefile.in    |  19 ++++++++++++++++
 textproc/libunistring/patches/patch-lib_stdbool.mini.h |  21 ++++++++++++++++++
 4 files changed, 45 insertions(+), 2 deletions(-)

diffs (72 lines):

diff -r c63bc5c623ee -r 3c8405892638 textproc/libunistring/Makefile
--- a/textproc/libunistring/Makefile    Fri Nov 12 12:31:04 2021 +0000
+++ b/textproc/libunistring/Makefile    Fri Nov 12 12:40:17 2021 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2020/01/18 23:35:29 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2021/11/12 12:40:17 nia Exp $
 
 DISTNAME=      libunistring-0.9.10
+PKGREVISION=   1
 CATEGORIES=    textproc
 MASTER_SITES=  http://ftp.gnu.org/gnu/libunistring/
 
diff -r c63bc5c623ee -r 3c8405892638 textproc/libunistring/distinfo
--- a/textproc/libunistring/distinfo    Fri Nov 12 12:31:04 2021 +0000
+++ b/textproc/libunistring/distinfo    Fri Nov 12 12:40:17 2021 +0000
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 11:22:17 nia Exp $
+$NetBSD: distinfo,v 1.12 2021/11/12 12:40:17 nia Exp $
 
 BLAKE2s (libunistring-0.9.10.tar.gz) = 6af4f8f362e74baf433757d540c157b1fead6e087f65969be54d0716bde97037
 SHA512 (libunistring-0.9.10.tar.gz) = 690082732fbbd47ab4ffbd6f21d85afece0f8e2ded24982f949f4ae52bf0a981b75ea9bc14ab289e0954cde07f31a7a4c2bb65615a8eb5b2bfa65720310b6fc9
 Size (libunistring-0.9.10.tar.gz) = 3744814 bytes
+SHA1 (patch-lib_Makefile.in) = f2335fa6a8b088e701a4d8bd433b45359be5c243
+SHA1 (patch-lib_stdbool.mini.h) = 0b4a3b3e461b517f28e9a58da0f50045467d2d2a
diff -r c63bc5c623ee -r 3c8405892638 textproc/libunistring/patches/patch-lib_Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/libunistring/patches/patch-lib_Makefile.in       Fri Nov 12 12:40:17 2021 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-lib_Makefile.in,v 1.1 2021/11/12 12:40:17 nia Exp $
+
+Test for c99 default before using stdbool instead of testing for GCC 2.95.
+PR pkg/56488: Solaris 10 compile issues, stdbool.h requires c99
+
+--- lib/Makefile.in.orig       2018-05-25 16:03:27.000000000 +0000
++++ lib/Makefile.in
+@@ -5804,9 +5804,9 @@ unistring/stdbool.h : $(STDBOOL_H) stdbo
+       { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+         echo '#if !defined _GL_STDBOOL_H'; \
+         if test -f /usr/include/stdbool.h; then \
+-          echo '#if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)) || defined _AIX'; \
++          echo '#if (__STDC_VERSION__ >= 199901L) || defined _AIX'; \
+         else \
+-          echo '#if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95))'; \
++          echo '#if (__STDC_VERSION__ >= 199901L)'; \
+         fi; \
+         echo '#include <stdbool.h>'; \
+         echo '#else'; \
diff -r c63bc5c623ee -r 3c8405892638 textproc/libunistring/patches/patch-lib_stdbool.mini.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/libunistring/patches/patch-lib_stdbool.mini.h    Fri Nov 12 12:40:17 2021 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-lib_stdbool.mini.h,v 1.1 2021/11/12 12:40:17 nia Exp $
+
+Test for c99 default before using stdbool instead of testing for GCC 2.95.
+PR pkg/56488: Solaris 10 compile issues, stdbool.h requires c99
+
+--- lib/stdbool.mini.h.orig    2018-02-12 12:16:29.000000000 +0000
++++ lib/stdbool.mini.h
+@@ -71,12 +71,7 @@
+      It is know not to work with:
+        - Sun C, on Solaris, if __C99FEATURES__ is defined but _STDC_C99 is not,
+        - MIPSpro C 7.30, on IRIX.  */
+-# if (__GNUC__ >= 3) \
+-     || defined __INTEL_COMPILER \
+-     || (_MSC_VER >= 1800) \
+-     || (defined __SUNPRO_C && defined _STDC_C99) \
+-     || (defined _AIX && !defined __GNUC__ && defined _ANSI_C_SOURCE) \
+-     || defined __HP_cc
++# if __STDC_VERSION__ >= 199901L
+    /* Assume the compiler has <stdbool.h>.  */
+ #  include <stdbool.h>
+ # else