diff options
| author | abs <abs@pkgsrc.org> | 2018-07-26 22:37:48 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2018-07-26 22:37:48 +0000 |
| commit | ccdcce3400585a09560ccb9d4cadd38c90c1723e (patch) | |
| tree | 535f6bbed8e23b89595753b6091996bf842a0a9b /textproc/icu | |
| parent | e08f9ac91e675da6032c40d5882e36c08d8258a0 (diff) | |
| download | pkgsrc-ccdcce3400585a09560ccb9d4cadd38c90c1723e.tar.gz | |
Rather than playing "reserved define whack-a-mole" on NetBSD by trying to
define _ISOC99_SOURCE to mitigate the damage of defining _XOPEN_SOURCE,
just don't define _XOPEN_SOURCE - nothing in the source defines it and
it breaks at least gcc 6.4 on NetBSD-8.0
No PKGREVISION bump as should not affect any building systems
Diffstat (limited to 'textproc/icu')
| -rw-r--r-- | textproc/icu/distinfo | 4 | ||||
| -rw-r--r-- | textproc/icu/patches/patch-common_uposixdefs.h | 15 |
2 files changed, 6 insertions, 13 deletions
diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo index e0ef34356d3..f2fded8cd3a 100644 --- a/textproc/icu/distinfo +++ b/textproc/icu/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.77 2018/07/20 03:32:09 ryoon Exp $ +$NetBSD: distinfo,v 1.78 2018/07/26 22:37:48 abs Exp $ SHA1 (icu4c-62_1-src.tgz) = 1884f26568cd773b984580b4fca422a3e2afe35d RMD160 (icu4c-62_1-src.tgz) = 12a6a975d211dfc2e5a13220b07b2cf3ec7a6923 @@ -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) = a2d7f686d7574a91e04fb771ab26ce5715ade984 +SHA1 (patch-common_uposixdefs.h) = 4739ca7d4662335adcb322cd0943770651d548ce 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 84cc288375f..2a15735cb48 100644 --- a/textproc/icu/patches/patch-common_uposixdefs.h +++ b/textproc/icu/patches/patch-common_uposixdefs.h @@ -1,14 +1,15 @@ -$NetBSD: patch-common_uposixdefs.h,v 1.5 2018/01/16 13:28:12 jperkin Exp $ +$NetBSD: patch-common_uposixdefs.h,v 1.6 2018/07/26 22:37:48 abs Exp $ C99 and related define overrides. +Do not play _XOPEN_SOURCE games on NetBSD, as it breaks at least gcc 6.4 on NetBSD-8.0 ---- common/uposixdefs.h.orig 2017-03-14 21:01:57.000000000 +0000 +--- common/uposixdefs.h.orig 2018-06-21 09:39:23.000000000 +0000 +++ common/uposixdefs.h @@ -44,8 +44,10 @@ * and define _XOPEN_SOURCE to different values depending on __STDC_VERSION__. * In C++ source code (e.g., putil.cpp), __STDC_VERSION__ is not defined at all. */ -+#if !defined(_SCO_DS) ++#if !defined(_SCO_DS) && !defined(__NetBSD__) # define _XOPEN_SOURCE 600 #endif +#endif @@ -27,11 +28,3 @@ C99 and related define overrides. /** * Solaris says: -@@ -68,4 +72,7 @@ - # define _STDC_C99 - #endif - -+#if defined(__cplusplus) && defined(__NetBSD__) -+#define _ISOC99_SOURCE -+#endif - #endif /* __UPOSIXDEFS_H__ */ |