diff options
| author | jperkin <jperkin@pkgsrc.org> | 2018-01-12 12:43:07 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2018-01-12 12:43:07 +0000 |
| commit | 90164d890e2121c4c26b80e0ed5dd2df1ed8bf94 (patch) | |
| tree | 856bd15b2ca4914d565399d36359cede98f99394 /textproc | |
| parent | e00ab6c4b949e59980da7344e60a672331739b0f (diff) | |
| download | pkgsrc-90164d890e2121c4c26b80e0ed5dd2df1ed8bf94.tar.gz | |
icu: Don't perform SunOS _STDC_C99 workaround with clang.
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/icu/distinfo | 4 | ||||
| -rw-r--r-- | textproc/icu/patches/patch-common_uposixdefs.h | 13 |
2 files changed, 12 insertions, 5 deletions
diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo index 0b679986164..eb64f5158ba 100644 --- a/textproc/icu/distinfo +++ b/textproc/icu/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.72 2017/12/14 21:28:32 adam Exp $ +$NetBSD: distinfo,v 1.73 2018/01/12 12:43:07 jperkin Exp $ SHA1 (icu4c-60_2-src.tgz) = 7a099523fcb708b427e94f9b3c372fec3ebd1563 RMD160 (icu4c-60_2-src.tgz) = e9ef04181123e82d2a846b23caff072e12982b39 @@ -10,7 +10,7 @@ SHA1 (patch-common_putil.cpp) = 6aa70b8698d663d3c798bafd9010a824c9609c20 SHA1 (patch-common_putilimp.h) = a68faa97c2bffeecaca1586e26f5bbe48e71b262 SHA1 (patch-common_umutex.h) = 096d3e15ef7b84533456af4570ed70747a4ef70c SHA1 (patch-common_unicode_platform.h) = 8b7b8bcf6f5185225a1ca516ac212a495f7b47e8 -SHA1 (patch-common_uposixdefs.h) = 52a6fa2c531068de285d9babb1a98b84c564450e +SHA1 (patch-common_uposixdefs.h) = 2de701a171bbb24e4cd814624d3b9f4807a921f8 SHA1 (patch-config_Makefile.inc.in) = e7cee161315321d2580074054d87714b55319886 SHA1 (patch-config_icu-config-bottom) = 168b89ee9180d4ae545125866ee91eb004010501 SHA1 (patch-config_mh-darwin) = 32f0e4c241535e37e4cad9b871ed3d36b4184199 diff --git a/textproc/icu/patches/patch-common_uposixdefs.h b/textproc/icu/patches/patch-common_uposixdefs.h index eaaee5a0581..293abe36bb6 100644 --- a/textproc/icu/patches/patch-common_uposixdefs.h +++ b/textproc/icu/patches/patch-common_uposixdefs.h @@ -1,6 +1,8 @@ -$NetBSD: patch-common_uposixdefs.h,v 1.3 2017/04/22 20:11:45 adam Exp $ +$NetBSD: patch-common_uposixdefs.h,v 1.4 2018/01/12 12:43:08 jperkin Exp $ ---- common/uposixdefs.h.orig 2017-03-09 02:12:45.000000000 +0000 +Don't perform _STDC_C99 workaround with clang. + +--- common/uposixdefs.h.orig 2017-03-14 21:01:57.000000000 +0000 +++ common/uposixdefs.h @@ -44,8 +44,10 @@ * and define _XOPEN_SOURCE to different values depending on __STDC_VERSION__. @@ -25,7 +27,12 @@ $NetBSD: patch-common_uposixdefs.h,v 1.3 2017/04/22 20:11:45 adam Exp $ /** * Solaris says: -@@ -68,4 +72,7 @@ +@@ -64,8 +68,11 @@ + * than a c99 or later compiler." + * Apparently C++11 is not "or later". Work around this. + */ +-#if defined(__cplusplus) && (defined(sun) || defined(__sun)) && !defined (_STDC_C99) ++#if defined(__cplusplus) && (defined(sun) || defined(__sun)) && !defined (_STDC_C99) && !defined(__clang__) # define _STDC_C99 #endif |