diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-08-27 13:19:25 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-08-27 13:33:44 +0200 |
| commit | c89dab21ea72cf6ce9f831678da251fd6e24341c (patch) | |
| tree | f6defceeb2b706e29feb9f17bccaefc2232c7f81 /icu | |
| parent | 38e0a58ce11125d20ef1f8aed7996518d7ddbb38 (diff) | |
fdo#53893: Undefine U_TIMEZONE for BSDs (except for NetBSD)
FreeBSD and other BSDs (except for NetBSD) must not define U_TIMEZONE. This
patch is obtained from upstream:
http://bugs.icu-project.org/trac/changeset?reponame=&new=31780
Change-Id: Id1b85b9958036230045c3e13eb4b6617e6bdc924
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/icu4c-bsd.patch | 22 | ||||
| -rw-r--r-- | icu/makefile.mk | 1 |
2 files changed, 23 insertions, 0 deletions
diff --git a/icu/icu4c-bsd.patch b/icu/icu4c-bsd.patch new file mode 100644 index 000000000000..78f8ca2758a9 --- /dev/null +++ b/icu/icu4c-bsd.patch @@ -0,0 +1,22 @@ +--- misc/icu/source/common/putilimp.h 2012-06-01 10:52:52.000000000 -0400 ++++ misc/build/icu/source/common/putilimp.h 2012-08-21 13:32:58.000000000 -0400 +@@ -117,6 +117,8 @@ + # define U_TIMEZONE __timezone + #elif U_PLATFORM_USES_ONLY_WIN32_API + # define U_TIMEZONE _timezone ++#elif U_PLATFORM == U_PF_BSD && !defined(__NetBSD__) ++ /* not defined */ + #elif U_PLATFORM == U_PF_OS400 + /* not defined */ + #else +--- misc/icu/source/common/unicode/platform.h 2012-08-21 16:53:20.957449000 -0400 ++++ misc/build/icu/source/common/unicode/platform.h 2012-08-21 17:02:16.000000000 -0400 +@@ -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) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ++#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) + # define U_PLATFORM U_PF_BSD + #elif defined(sun) || defined(__sun) + /* Check defined(__SVR4) || defined(__svr4__) to distinguish Solaris from SunOS? */ diff --git a/icu/makefile.mk b/icu/makefile.mk index 7b990ab95a0d..aaace59e8c94 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -49,6 +49,7 @@ TARFILE_ROOTDIR=icu #http://bugs.icu-project.org/trac/ticket/8198 rendering with 0D30 and 0D31 PATCH_FILES=\ + icu4c-bsd.patch \ icu4c-build.patch \ icu4c.8320.freeserif.crash.patch \ icu4c.8198.revert.icu5431.patch \ |