summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-03-17 10:07:48 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-03-17 10:07:48 +0000
commitd584a6faa86c772504d4d39cc636c80663fc993a (patch)
tree59c937fb15d35f4fd037cd548a63ab734420200e /Build
parentf115817e02fca7b3b0efee79cc33fc8e26b0e6c1 (diff)
icu: Detect kFreeBSD (patch from ICU)
git-svn-id: svn://tug.org/texlive/trunk@25674 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/libs/icu/icu-49.1-PATCHES/ChangeLog4
-rw-r--r--Build/source/libs/icu/icu-49.1-PATCHES/patch-04-FreeBSD23
-rw-r--r--Build/source/libs/icu/icu-49.1/common/unicode/platform.h4
3 files changed, 29 insertions, 2 deletions
diff --git a/Build/source/libs/icu/icu-49.1-PATCHES/ChangeLog b/Build/source/libs/icu/icu-49.1-PATCHES/ChangeLog
index 918f97caab4..210cb8752e2 100644
--- a/Build/source/libs/icu/icu-49.1-PATCHES/ChangeLog
+++ b/Build/source/libs/icu/icu-49.1-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-17 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-04-FreeBSD (new): From ICU.
+
2012-03-15 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-40-auxParam: Fix a typo (auxillary => auxiliary).
diff --git a/Build/source/libs/icu/icu-49.1-PATCHES/patch-04-FreeBSD b/Build/source/libs/icu/icu-49.1-PATCHES/patch-04-FreeBSD
new file mode 100644
index 00000000000..11454e8cc9c
--- /dev/null
+++ b/Build/source/libs/icu/icu-49.1-PATCHES/patch-04-FreeBSD
@@ -0,0 +1,23 @@
+ Patch from ICU for ticket 9197
+
+diff -ur icu-49.rc.orig/source/common/unicode/platform.h icu-49.rc/source/common/unicode/platform.h
+--- icu-49.rc.orig/source/common/unicode/platform.h 2012-03-02 23:11:48.000000000 +0100
++++ icu-49.rc/source/common/unicode/platform.h 2012-03-17 10:45:22.000000000 +0100
+@@ -1,7 +1,7 @@
+ /*
+ ******************************************************************************
+ *
+-* Copyright (C) 1997-2011, International Business Machines
++* Copyright (C) 1997-2012, International Business Machines
+ * Corporation and others. All Rights Reserved.
+ *
+ ******************************************************************************
+@@ -131,7 +131,7 @@
+ # include <android/api-level.h>
+ #elif defined(linux) || defined(__linux__) || defined(__linux)
+ # define U_PLATFORM U_PF_LINUX
+-#elif defined(BSD)
++#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ # define U_PLATFORM U_PF_BSD
+ #elif defined(sun) || defined(__sun)
+ /* Check defined(__SVR4) || defined(__svr4__) to distinguish Solaris from SunOS? */
diff --git a/Build/source/libs/icu/icu-49.1/common/unicode/platform.h b/Build/source/libs/icu/icu-49.1/common/unicode/platform.h
index e1b815b777b..dccc7018e0d 100644
--- a/Build/source/libs/icu/icu-49.1/common/unicode/platform.h
+++ b/Build/source/libs/icu/icu-49.1/common/unicode/platform.h
@@ -1,7 +1,7 @@
/*
******************************************************************************
*
-* Copyright (C) 1997-2011, International Business Machines
+* Copyright (C) 1997-2012, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@@ -131,7 +131,7 @@
# include <android/api-level.h>
#elif defined(linux) || defined(__linux__) || defined(__linux)
# define U_PLATFORM U_PF_LINUX
-#elif defined(BSD)
+#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
# define U_PLATFORM U_PF_BSD
#elif defined(sun) || defined(__sun)
/* Check defined(__SVR4) || defined(__svr4__) to distinguish Solaris from SunOS? */