summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2015-10-26 09:48:14 +0000
committerjperkin <jperkin@pkgsrc.org>2015-10-26 09:48:14 +0000
commit736b7bfb41eb1860cfbbf61d906b161122c7b404 (patch)
tree4972d074388c54282a3c6998a46f17b1544a436b /textproc
parentdb973246a1592c7ae6a5938661fe13c7cc4d0607 (diff)
downloadpkgsrc-736b7bfb41eb1860cfbbf61d906b161122c7b404.tar.gz
Fix preprocessor logic bug causing __STRICT_ANSI__ to be undefined on all
platforms, breaking SunOS/clang's use of GCC headers around __float128.
Diffstat (limited to 'textproc')
-rw-r--r--textproc/icu/distinfo3
-rw-r--r--textproc/icu/patches/patch-tools_pkgdata_pkgdata.cpp15
2 files changed, 17 insertions, 1 deletions
diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo
index 15bcf6eaa66..a1c8dadc83e 100644
--- a/textproc/icu/distinfo
+++ b/textproc/icu/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.57 2015/10/26 09:28:20 jperkin Exp $
+$NetBSD: distinfo,v 1.58 2015/10/26 09:48:14 jperkin Exp $
SHA1 (icu4c-56_1-src.tgz) = e4494ce9425c469f138bb6e1ae06faf7fa0cf3de
RMD160 (icu4c-56_1-src.tgz) = 1ef7f377283a379654ebb051b7439c2cc6151da0
@@ -20,3 +20,4 @@ SHA1 (patch-config_mh-solaris-gcc) = 19f76c27bef22cc3b572e4b67a526d5f1aa077bc
SHA1 (patch-configure) = 429c0b3eb3f7d0a8cf3d01a9bc359132eebe8cf4
SHA1 (patch-configure.ac) = b0291cf02351cbad9b0c7340baea9eb81cabb158
SHA1 (patch-tools-toolutil-pkg_genc.c) = b5a9eb679908d9f579ff095c5389ec1aa8df8e1e
+SHA1 (patch-tools_pkgdata_pkgdata.cpp) = 1c87fcc511f0e6cedbaf01c5164e522c33f19458
diff --git a/textproc/icu/patches/patch-tools_pkgdata_pkgdata.cpp b/textproc/icu/patches/patch-tools_pkgdata_pkgdata.cpp
new file mode 100644
index 00000000000..5e99d504e93
--- /dev/null
+++ b/textproc/icu/patches/patch-tools_pkgdata_pkgdata.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-tools_pkgdata_pkgdata.cpp,v 1.1 2015/10/26 09:48:14 jperkin Exp $
+
+Fix preprocessor logic bug.
+
+--- tools/pkgdata/pkgdata.cpp.orig 2015-10-08 03:54:02.000000000 +0000
++++ tools/pkgdata/pkgdata.cpp
+@@ -24,7 +24,7 @@
+ #include "putilimp.h"
+
+ #if U_HAVE_POPEN
+-#if (U_PF_MINGW <= U_PLATFORM || U_PLATFORM <= U_PF_CYGWIN) && defined(__STRICT_ANSI__)
++#if (U_PLATFORM <= U_PF_MINGW || U_PLATFORM <= U_PF_CYGWIN) && defined(__STRICT_ANSI__)
+ /* popen/pclose aren't defined in strict ANSI on Cygwin and MinGW */
+ #undef __STRICT_ANSI__
+ #endif