summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-04-24 09:57:48 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-04-24 09:57:48 +0000
commitdc1bb1c01b4099afdb9e7a4b0ab1ec83400fdc37 (patch)
tree41b51c4c4955f29daef23f1a0b42933eb5a85418 /Build
parent8c9e19999acc6964e0ea1689190296b3b61cf7df (diff)
icu: Build fix for FreeBSD, problem reported by Nikola Lecic
git-svn-id: svn://tug.org/texlive/trunk@26121 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/libs/icu/icu-49.1-PATCHES/ChangeLog5
-rw-r--r--Build/source/libs/icu/icu-49.1-PATCHES/patch-02-FreeBSD14
-rw-r--r--Build/source/libs/icu/icu-49.1/common/putilimp.h2
3 files changed, 21 insertions, 0 deletions
diff --git a/Build/source/libs/icu/icu-49.1-PATCHES/ChangeLog b/Build/source/libs/icu/icu-49.1-PATCHES/ChangeLog
index 74413962267..40e7801b383 100644
--- a/Build/source/libs/icu/icu-49.1-PATCHES/ChangeLog
+++ b/Build/source/libs/icu/icu-49.1-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-24 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-02-FreeBSD (new): Build fix for FreeBSD.
+ Reported by Nikola Lecic <nikola.lecic@anthesphoria.net>
+
2012-04-01 Peter Breitenlohner <peb@mppmu.mpg.de>
Reduced size of data/in/icudt49l.dat, removing
diff --git a/Build/source/libs/icu/icu-49.1-PATCHES/patch-02-FreeBSD b/Build/source/libs/icu/icu-49.1-PATCHES/patch-02-FreeBSD
new file mode 100644
index 00000000000..f6232e31374
--- /dev/null
+++ b/Build/source/libs/icu/icu-49.1-PATCHES/patch-02-FreeBSD
@@ -0,0 +1,14 @@
+ The FreeBSD declaration of timezone conflicts with Posix.
+
+diff -ur icu-49.1.orig/source/common/putilimp.h icu-49.1/source/common/putilimp.h
+--- icu-49.1.orig/source/common/putilimp.h 2012-03-21 18:35:16.000000000 +0100
++++ icu-49.1/source/common/putilimp.h 2012-04-24 11:38:09.000000000 +0200
+@@ -116,6 +116,8 @@
+ # define U_TIMEZONE __timezone
+ #elif U_PLATFORM_USES_ONLY_WIN32_API
+ # define U_TIMEZONE _timezone
++#elif U_PLATFORM == U_PF_BSD && !defined(__FreeBSD_kernel__)
++ /* not defined */
+ #elif U_PLATFORM == U_PF_OS400
+ /* not defined */
+ #else
diff --git a/Build/source/libs/icu/icu-49.1/common/putilimp.h b/Build/source/libs/icu/icu-49.1/common/putilimp.h
index cbec89bf590..112146a36c3 100644
--- a/Build/source/libs/icu/icu-49.1/common/putilimp.h
+++ b/Build/source/libs/icu/icu-49.1/common/putilimp.h
@@ -116,6 +116,8 @@ typedef size_t uintptr_t;
# define U_TIMEZONE __timezone
#elif U_PLATFORM_USES_ONLY_WIN32_API
# define U_TIMEZONE _timezone
+#elif U_PLATFORM == U_PF_BSD && !defined(__FreeBSD_kernel__)
+ /* not defined */
#elif U_PLATFORM == U_PF_OS400
/* not defined */
#else