diff options
| author | ryoon <ryoon@pkgsrc.org> | 2013-11-05 15:25:37 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2013-11-05 15:25:37 +0000 |
| commit | 48529c48a89c01cdab69aae235c9292d71132859 (patch) | |
| tree | e7730a2bf69a2a594104b3ba33ebaba13ffee619 | |
| parent | d74195b86115909616dc2740cdcaf55cf225e1e8 (diff) | |
| download | pkgsrc-48529c48a89c01cdab69aae235c9292d71132859.tar.gz | |
Fix build on ARM platform.
| -rw-r--r-- | textproc/icu/distinfo | 4 | ||||
| -rw-r--r-- | textproc/icu/patches/patch-common_putilimp.h | 13 |
2 files changed, 14 insertions, 3 deletions
diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo index 3bf3605297a..1bd29352eb5 100644 --- a/textproc/icu/distinfo +++ b/textproc/icu/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.40 2013/10/19 08:47:36 adam Exp $ +$NetBSD: distinfo,v 1.41 2013/11/05 15:25:37 ryoon Exp $ SHA1 (icu4c-52_1-src.tgz) = 6de440b71668f1a65a9344cdaf7a437291416781 RMD160 (icu4c-52_1-src.tgz) = cbfbb18c3991ba55ebb50c607d5208cbfeb9fce3 @@ -9,7 +9,7 @@ SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886 SHA1 (patch-ad) = 8189e81e9c624e3b7a42f9af65a4b2f334747284 SHA1 (patch-af) = dcfbaf16844292a9ae57536ae2fb62fd1659d067 SHA1 (patch-common_Makefile.in) = 20fa472bd0e5e5fac15153774a58a8ce034d1996 -SHA1 (patch-common_putilimp.h) = fa01ff80b5e921444cbdab2ef273516c78d8afde +SHA1 (patch-common_putilimp.h) = a68faa97c2bffeecaca1586e26f5bbe48e71b262 SHA1 (patch-common_unicode_platform.h) = 6b5989b06db0431f391809af05a1dca302f2e906 SHA1 (patch-common_uposixdefs.h) = abe1989ea4312702e5d0172b662409957b3e2d91 SHA1 (patch-config_icu-config-bottom) = 168b89ee9180d4ae545125866ee91eb004010501 diff --git a/textproc/icu/patches/patch-common_putilimp.h b/textproc/icu/patches/patch-common_putilimp.h index 7d8495c6d6f..82bc3eb26f9 100644 --- a/textproc/icu/patches/patch-common_putilimp.h +++ b/textproc/icu/patches/patch-common_putilimp.h @@ -1,4 +1,6 @@ -$NetBSD: patch-common_putilimp.h,v 1.3 2013/10/19 08:47:36 adam Exp $ +$NetBSD: patch-common_putilimp.h,v 1.4 2013/11/05 15:25:37 ryoon Exp $ + +* GCC for arm does not have __sync_add_and_fetch() etc. --- common/putilimp.h.orig 2013-10-04 20:49:30.000000000 +0000 +++ common/putilimp.h @@ -11,3 +13,12 @@ $NetBSD: patch-common_putilimp.h,v 1.3 2013/10/19 08:47:36 adam Exp $ #else # define U_TIMEZONE timezone #endif +@@ -187,7 +189,7 @@ typedef size_t uintptr_t; + /* Use the predefined value. */ + #elif U_PLATFORM == U_PF_MINGW + #define U_HAVE_GCC_ATOMICS 0 +-#elif U_GCC_MAJOR_MINOR >= 404 || defined(__clang__) ++#elif (U_GCC_MAJOR_MINOR >= 404 && !defined(__arm__)) || defined(__clang__) + /* TODO: Intel icc and IBM xlc on AIX also support gcc atomics. (Intel originated them.) + * Add them for these compilers. + * Note: Clang sets __GNUC__ defines for version 4.2, so misses the 4.4 test here. |