Bug 1002437 - Build ICU with U_CHARSET_IS_UTF8. r=glandium.
authorHenri Sivonen <hsivonen@hsivonen.fi>
Wed, 30 Apr 2014 10:42:59 +0300
changeset 181355 72215f1d9de0f14b25547023767b94d03e3eb9b9
parent 181354 9ff13ffd5f259fd0fc0f444ba95b1fa6c4199b15
child 181356 133eecf5f0f0471c090ae41a3ba6ae44d1ee6d7b
push id272
push userpvanderbeken@mozilla.com
push dateMon, 05 May 2014 16:31:18 +0000
reviewersglandium
bugs1002437
milestone32.0a1
Bug 1002437 - Build ICU with U_CHARSET_IS_UTF8. r=glandium.
build/autoconf/icu.m4
--- a/build/autoconf/icu.m4
+++ b/build/autoconf/icu.m4
@@ -143,16 +143,18 @@ if test -z "$BUILDING_JS" -o -n "$JS_STA
         # don't include obsolete header files
         ICU_CPPFLAGS="$ICU_CPPFLAGS -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1"
         # remove chunks of the library that we don't need (yet)
         ICU_CPPFLAGS="$ICU_CPPFLAGS -DUCONFIG_NO_LEGACY_CONVERSION"
         ICU_CPPFLAGS="$ICU_CPPFLAGS -DUCONFIG_NO_TRANSLITERATION"
         ICU_CPPFLAGS="$ICU_CPPFLAGS -DUCONFIG_NO_REGULAR_EXPRESSIONS"
         ICU_CPPFLAGS="$ICU_CPPFLAGS -DUCONFIG_NO_BREAK_ITERATION"
         ICU_CPPFLAGS="$ICU_CPPFLAGS -DUCONFIG_NO_IDNA"
+        # we don't need to pass data to and from legacy char* APIs
+        ICU_CPPFLAGS="$ICU_CPPFLAGS -DU_CHARSET_IS_UTF8"
         # make sure to not accidentally pick up system-icu headers
         ICU_CPPFLAGS="$ICU_CPPFLAGS -I$icudir/common -I$icudir/i18n"
 
         ICU_CROSS_BUILD_OPT=""
         ICU_SRCDIR=""
         if test "$HOST_OS_ARCH" = "WINNT"; then
     	ICU_SRCDIR="--srcdir=$(cd $srcdir/intl/icu/source; pwd -W)"
         fi