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
This commit is contained in:
parent
38e0a58ce1
commit
c89dab21ea
22
icu/icu4c-bsd.patch
Normal file
22
icu/icu4c-bsd.patch
Normal file
@ -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? */
|
@ -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 \
|
||||
|
Loading…
x
Reference in New Issue
Block a user