diff options
author | hans <hans> | 2012-05-08 16:10:38 +0000 |
---|---|---|
committer | hans <hans> | 2012-05-08 16:10:38 +0000 |
commit | 3a4698575d17b108514493c0d7262a3500719168 (patch) | |
tree | f97b2293a3d15aa84ae628039cd12836755805de /textproc/icu | |
parent | 8f675f239f250ee86cd10a9060c088895bdcedaa (diff) | |
download | pkgsrc-3a4698575d17b108514493c0d7262a3500719168.tar.gz |
Avoid C99/XOPEN_SOURCE confusion. Fixes build on SunOS.
Diffstat (limited to 'textproc/icu')
-rw-r--r-- | textproc/icu/Makefile | 7 | ||||
-rw-r--r-- | textproc/icu/distinfo | 3 | ||||
-rw-r--r-- | textproc/icu/patches/patch-common_uposixdefs.h | 16 |
3 files changed, 24 insertions, 2 deletions
diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile index c4017abd670..d6b42ba26e1 100644 --- a/textproc/icu/Makefile +++ b/textproc/icu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.71 2012/04/27 10:54:48 obache Exp $ +# $NetBSD: Makefile,v 1.72 2012/05/08 16:10:38 hans Exp $ DISTNAME= icu4c-49_1_1-src PKGNAME= ${DISTNAME:S/4c//:S/-src//:S/_/./g} @@ -41,6 +41,11 @@ PLIST_SUBST+= MH_NAME=mh-solaris-gcc . else PLIST_SUBST+= MH_NAME=mh-solaris . endif +. if !empty(CC_VERSION:Mgcc-4.[6-9].*) +BUILDLINK_TRANSFORM+= rm:-D__STDC__=0 +. endif +BUILDLINK_TRANSFORM+= rm:-ansi +CFLAGS.SunOS+= -std=c99 .elif ${OPSYS} == "IRIX" PLIST_SUBST+= MH_NAME=mh-irix .elif ${OPSYS} == "Darwin" diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo index 4400bc49d2b..2b8ebbca458 100644 --- a/textproc/icu/distinfo +++ b/textproc/icu/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.26 2012/04/26 18:12:37 martin Exp $ +$NetBSD: distinfo,v 1.27 2012/05/08 16:10:38 hans Exp $ SHA1 (icu4c-49_1_1-src.tgz) = f407d7e2808b76e3a6ca316aab896aef74bf6722 RMD160 (icu4c-49_1_1-src.tgz) = ad47b292be561398b25d198a35c025670432c3f1 @@ -9,4 +9,5 @@ SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886 SHA1 (patch-ad) = f7f20248608e1326359d4464ace32e4ee3031fcb SHA1 (patch-af) = c81168246649f191ebb19a61fb216e172aac3cc2 SHA1 (patch-common_unicode_platform.h) = 96a516acf790d3fac9fa9be8f9752e94b86b167f +SHA1 (patch-common_uposixdefs.h) = abe1989ea4312702e5d0172b662409957b3e2d91 SHA1 (patch-config_icu-config-bottom) = 4a167249d58cb6c729bc164e6abae869dd5e6b1a diff --git a/textproc/icu/patches/patch-common_uposixdefs.h b/textproc/icu/patches/patch-common_uposixdefs.h new file mode 100644 index 00000000000..22d34bc766a --- /dev/null +++ b/textproc/icu/patches/patch-common_uposixdefs.h @@ -0,0 +1,16 @@ +$NetBSD: patch-common_uposixdefs.h,v 1.1 2012/05/08 16:10:39 hans Exp $ + +--- common/uposixdefs.h.orig 2012-04-05 22:46:18.000000000 +0200 ++++ common/uposixdefs.h 2012-05-08 15:28:20.516380420 +0200 +@@ -52,9 +52,11 @@ + * + * z/OS needs this definition for timeval and to get usleep. + */ ++#ifndef __sun + #if !defined(_XOPEN_SOURCE_EXTENDED) + # define _XOPEN_SOURCE_EXTENDED 1 + #endif ++#endif + + /* + * There is an issue with turning on _XOPEN_SOURCE_EXTENDED on certain platforms. |