Use Chromium's fork of ICU (with prebuilt .dat archive), fixes #36 (#49)

pmlocek · DanielZlotin · commit a6f2869c5148 · 2018-07-26T16:47:23.000+03:00
* use Chromium's fork of ICU

* Restore default ICU data Makefile.in; Force JSC to use our build of ICU instead of system-wide from pkg-config; use locale.h instead of xlocale.h in ICU

* Use static build of ICU to take advantage of link-time GC to reduce output library size

* Disable patching disable icu during compiling, moved to prep

* Fix regression: non-intl build was linking with i18n ICU and full ICU data
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
   },
   "config": {
     "webkitGTK": "2.18.2",
-    "androidICU": "8.0.0_r34",
+    "chromiumICUCommit": "b34251f8b762f8e2112a89c587855ca4297fed96",
     "i18n": false
   }
 }
diff --git a/patches/icu.patch b/patches/icu.patch
@@ -44,15 +44,19 @@ diff -aur target-org/icu/source/data/Makefile.in target/icu/source/data/Makefile
  
  # This allows all the data to be in one directory
  ifeq ($(PKGDATA_MODE),dll)
-@@ -448,6 +448,11 @@
- MISC_FILES_LIST=$(DAT_FILES_SHORT) $(CNV_FILES_SHORT) $(CNV_FILES_SHORT_SPECIAL) $(CURR_FILES_SHORT) $(RBNF_FILES_SHORT) $(RBNF_INDEX_RES_SHORT) $(TRANSLIT_FILES_SHORT) $(SPREP_FILES_SHORT) $(CFU_FILES_SHORT)
- UNI_CORE_DATA=pnames.icu uprops.icu ucase.icu ubidi.icu nfc.nrm
- UNI_CORE_TARGET_DATA=$(UNI_CORE_DATA:%=$(BUILDDIR)/%)
-+BRK_FILES_LIST=""
-+LOCALE_FILES_LIST=$(RES_FILES_SHORT) 
-+MISC_FILES_LIST=coll/ucadata.icu
-+
-+
+diff -aur target-org/icu/source/i18n/digitlst.cpp target/icu/source/i18n/digitlst.cpp
+--- target-org/icu/source/i18n/digitlst.cpp	2018-07-23 11:20:13.000000000 +0200
++++ target/icu/source/i18n/digitlst.cpp	2018-07-23 15:29:24.729402639 +0200
+@@ -61,11 +61,7 @@
+ #endif
  
- ifneq ($(INCLUDE_UNI_CORE_DATA),)
- MISC_FILES_LIST+=$(UNI_CORE_DATA)
+ #if U_USE_STRTOD_L
+-# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN
+-#   include <locale.h>
+-# else
+-#   include <xlocale.h>
+-# endif
++# include <locale.h>
+ #endif
+ 
+ // ***************************************************************************
diff --git a/patches/jsc.patch b/patches/jsc.patch
@@ -183,4 +183,67 @@ diff -aur org/target/webkit/Source/cmake/OptionsCommon.cmake target/webkit/Sourc
  _HAVE_CHECK_INCLUDE(HAVE_MMAP sys/mman.h)
  _HAVE_CHECK_INCLUDE(HAVE_PTHREAD_NP_H pthread_np.h)
  _HAVE_CHECK_INCLUDE(HAVE_STRINGS_H strings.h)
-
+diff -aur target-org/webkit/Source/cmake/FindICU.cmake target/webkit/Source/cmake/FindICU.cmake
+--- target-org/webkit/Source/cmake/FindICU.cmake	2018-07-24 15:41:23.452474811 +0200
++++ target/webkit/Source/cmake/FindICU.cmake	2018-07-12 15:53:44.611542333 +0200
+@@ -16,19 +16,15 @@
+ find_path(
+     ICU_INCLUDE_DIR
+     NAMES unicode/utypes.h
+-    HINTS ${PC_ICU_INCLUDE_DIRS}
+-          ${PC_ICU_INCLUDEDIR}
+-          ${WEBKIT_LIBRARIES_INCLUDE_DIR}
++    HINTS ${WEBKIT_LIBRARIES_INCLUDE_DIR}
+     DOC "Include directory for the ICU library")
+ mark_as_advanced(ICU_INCLUDE_DIR)
+ 
+ # Look for the library.
+ find_library(
+     ICU_LIBRARY
+-    NAMES libicuuc cygicuuc cygicuuc32 icuuc icuuc_jsc
+-    HINTS ${PC_ICU_LIBRARY_DIRS}
+-          ${PC_ICU_LIBDIR}
+-          ${WEBKIT_LIBRARIES_LINK_DIR}
++    NAMES icuuc_jsc
++    HINTS ${WEBKIT_LIBRARIES_LINK_DIR}
+     DOC "Libraries to link against for the common parts of ICU")
+ mark_as_advanced(ICU_LIBRARY)
+ 
+@@ -51,10 +47,8 @@
+     pkg_check_modules(PC_ICU_I18N icu-i18n)
+     find_library(
+         ICU_I18N_LIBRARY
+-        NAMES icui18n libicui18n libicuin cygicuin cygicuin32 icuin icui18n_jsc
+-        HINTS ${PC_ICU_I18N_LIBRARY_DIRS}
+-              ${PC_ICU_I18N_LIBDIR}
+-              ${WEBKIT_LIBRARIES_LINK_DIR}
++        NAMES icui18n_jsc
++        HINTS ${WEBKIT_LIBRARIES_LINK_DIR}
+         DOC "Libraries to link against for ICU internationalization")
+     mark_as_advanced(ICU_I18N_LIBRARY)
+     if (ICU_I18N_LIBRARY)
+@@ -68,10 +62,8 @@
+     # Look for the ICU data libraries
+     find_library(
+         ICU_DATA_LIBRARY
+-        NAMES icudata libicudata cygicudata cygicudata32 icudata_jsc
+-        HINTS ${PC_ICU_I18N_LIBRARY_DIRS}
+-              ${PC_ICU_I18N_LIBDIR}
+-              ${WEBKIT_LIBRARIES_LINK_DIR}
++        NAMES icudata_jsc
++        HINTS ${WEBKIT_LIBRARIES_LINK_DIR}
+         DOC "Libraries to link against for ICU data")
+     mark_as_advanced(ICU_DATA_LIBRARY)
+     if (ICU_DATA_LIBRARY)
+diff -aur target-org/webkit/Source/JavaScriptCore/CMakeLists.txt target/webkit/Source/JavaScriptCore/CMakeLists.txt
+--- target-org/webkit/Source/JavaScriptCore/CMakeLists.txt	2018-07-25 09:56:23.662494914 +0200
++++ target/webkit/Source/JavaScriptCore/CMakeLists.txt	2018-07-18 12:55:24.726736260 +0200
+@@ -1072,6 +1072,8 @@
+ set(JavaScriptCore_LIBRARIES
+     WTF${DEBUG_SUFFIX}
+     ${ICU_I18N_LIBRARIES}
++    ${ICU_LIBRARIES}
++    ${ICU_DATA_LIBRARIES}
+     ${LLVM_LIBRARIES}
+ )
+ 
diff --git a/scripts/compile/common.sh b/scripts/compile/common.sh
@@ -124,6 +124,7 @@ COMMON_LDFLAGS=" \
 -fuse-ld=gold \
 -Wl,--icf=safe \
 -Wl,-z,noexecstack \
+-Wl,--gc-sections \
 "
 
 COMMON_CFLAGS=" \
@@ -144,9 +145,12 @@ COMMON_CXXFLAGS=" \
 --std=c++11 \
 "
 
-ICU_CFLAGS="$COMMON_CFLAGS $PLATFORM_CFLAGS -Os"
-ICU_CXXFLAGS="$COMMON_CXXFLAGS $ICU_CFLAGS -Os"
+ICU_CFLAGS="$COMMON_CFLAGS $PLATFORM_CFLAGS -Oz"
+ICU_CXXFLAGS="$COMMON_CXXFLAGS $ICU_CFLAGS -Oz"
 ICU_LDFLAGS="$COMMON_LDFLAGS $PLATFORM_LDFLAGS -s"
 
+JSC_LDFLAGS="$COMMON_LDFLAGS"
+JSC_CFLAGS="$COMMON_CFLAGS -DU_STATIC_IMPLEMENTATION=1 -DU_SHOW_CPLUSPLUS_API=0"
+
 INSTALL_DIR=$ROOTDIR/build/compiled/$JNI_ARCH
 mkdir -p $INSTALL_DIR
diff --git a/scripts/compile/icu.sh b/scripts/compile/icu.sh
@@ -20,7 +20,8 @@ PATH=$TOOLCHAIN_DIR/bin:$PATH
 
 $TARGETDIR/icu/source/configure --prefix=$(pwd)/prebuilts \
     --host=$CROSS_COMPILE_PLATFORM \
-    --enable-shared=yes \
+    --enable-static=yes \
+    --enable-shared=no \
     --enable-extras=no \
     --enable-strict=no \
     --enable-icuio=no \
@@ -30,25 +31,19 @@ $TARGETDIR/icu/source/configure --prefix=$(pwd)/prebuilts \
     --enable-tests=no \
     --enable-samples=no \
     --enable-dyload=no \
-    -with-cross-build=$CROSS_BUILD_DIR \
+    --with-cross-build=$CROSS_BUILD_DIR \
     CFLAGS="$ICU_CFLAGS" \
     CXXFLAGS="$ICU_CXXFLAGS" \
     LDFLAGS="$ICU_LDFLAGS" \
     CC=$CROSS_COMPILE_PLATFORM-clang \
     CXX=$CROSS_COMPILE_PLATFORM-clang++ \
     AR=$CROSS_COMPILE_PLATFORM-ar \
     RINLIB=$CROSS_COMPILE_PLATFORM-ranlib \
-    --with-data-packaging=library
+    --with-data-packaging=static
 
 make -j5
 
-if [[ $ENABLE_INTL ]]; then
-    cp lib/libicudata_jsc.so $INSTALL_DIR/libicudata_jsc.so
-    cp lib/libicui18n_jsc.so.$ICU_VERSION $INSTALL_DIR/libicui18n_jsc.so
-else
-    rm lib/libicui18n_jsc.so*
-    cp stubdata/libicudata_jsc.so.$ICU_VERSION lib/
-    cp stubdata/libicudata_jsc.so.$ICU_VERSION $INSTALL_DIR/libicudata_jsc.so
+if ! [[ $ENABLE_INTL ]]; then
+  rm lib/libicui18n_jsc.a
+  cp stubdata/libicudata_jsc.a lib/
 fi
-
-cp lib/libicuuc_jsc.so.$ICU_VERSION $INSTALL_DIR/libicuuc_jsc.so
diff --git a/scripts/compile/jsc.sh b/scripts/compile/jsc.sh
@@ -6,28 +6,24 @@ source $SCRIPT_DIR/common.sh
 CMAKE_FOLDER=$(cd $ANDROID_HOME/cmake && ls -1 | sort -r | head -1)
 PATH=$TOOLCHAIN_DIR/bin:$ANDROID_HOME/cmake/$CMAKE_FOLDER/bin/:$PATH
 
-# conditional patch
-if ! [[ $ENABLE_INTL ]]; then
-  patch -d $TARGETDIR -N -p1 < $ROOTDIR/patches/intl/icu-disabled.patch
-fi
-
 rm -rf $TARGETDIR/webkit/$CROSS_COMPILE_PLATFORM-${FLAVOR}
 rm -rf $TARGETDIR/webkit/WebKitBuild
 cd $TARGETDIR/webkit/Tools/Scripts
 
 CMAKE_CXX_FLAGS=" \
 $SWITCH_JSC_CFLAGS_COMPAT \
-$COMMON_CFLAGS \
+$JSC_CFLAGS \
 $PLATFORM_CFLAGS \
 -fno-rtti \
 -I$TARGETDIR/icu/source/i18n \
 -I$TOOLCHAIN_DIR/sysroot/usr/include \
 "
+
 CMAKE_LD_FLAGS=" \
 -latomic \
 -lm \
 -lc++_shared \
-$COMMON_LDFLAGS \
+$JSC_LDFLAGS \
 $PLATFORM_LDFLAGS \
 "
 
@@ -50,6 +46,7 @@ $TARGETDIR/webkit/Tools/Scripts/build-webkit \
   -DCMAKE_C_COMPILER=$CROSS_COMPILE_PLATFORM-clang \
   -DCMAKE_CXX_COMPILER=$CROSS_COMPILE_PLATFORM-clang \
   -DCMAKE_SYSROOT=$TOOLCHAIN_DIR/sysroot \
+  -DCMAKE_SYSROOT_COMPILE=$TOOLCHAIN_DIR/sysroot \
   -DCMAKE_CXX_FLAGS='${CMAKE_CXX_FLAGS} $COMMON_CXXFLAGS $CMAKE_CXX_FLAGS' \
   -DCMAKE_C_FLAGS='${CMAKE_C_FLAGS} $CMAKE_CXX_FLAGS' \
   -DCMAKE_SHARED_LINKER_FLAGS='${CMAKE_SHARED_LINKER_FLAGS} $CMAKE_LD_FLAGS' \
@@ -61,9 +58,3 @@ $TARGETDIR/webkit/Tools/Scripts/build-webkit \
 cp $TARGETDIR/webkit/WebKitBuild/Release/lib/libjsc.so $INSTALL_DIR
 mv $TARGETDIR/webkit/WebKitBuild $TARGETDIR/webkit/${CROSS_COMPILE_PLATFORM}-${FLAVOR}
 cp $TOOLCHAIN_LINK_DIR/libc++_shared.so $INSTALL_DIR
-
-# conditional patch undo
-cd $ROOTDIR
-if ! [[ $ENABLE_INTL ]]; then
-  patch -d $TARGETDIR -p1 -R < $ROOTDIR/patches/intl/icu-disabled.patch
-fi
diff --git a/scripts/download.sh b/scripts/download.sh
@@ -11,4 +11,4 @@ svn export https://svn.webkit.org/repository/webkit/$SVN_URL/Tools $TARGET_DIR/w
 svn export https://svn.webkit.org/repository/webkit/$SVN_URL/CMakeLists.txt $TARGET_DIR/webkit/CMakeLists.txt
 
 mkdir -p $TARGET_DIR/icu
-curl "https://android.googlesource.com/platform/external/icu/+archive/android-${npm_package_config_androidICU}/icu4c.tar.gz" | tar xzf - -C $TARGET_DIR/icu
+curl "https://chromium.googlesource.com/chromium/deps/icu/+archive/${npm_package_config_chromiumICUCommit}.tar.gz" | tar xzf - -C $TARGET_DIR/icu
diff --git a/scripts/prep.sh b/scripts/prep.sh
@@ -8,15 +8,28 @@ rm -rf $TARGETDIR
 cp -Rf $ROOTDIR/build/download $TARGETDIR
 
 echo "=============== patch and make icu into target/icu/host ====================="
+ICU_VERSION_MAJOR="$(awk '/ICU_VERSION_MAJOR_NUM/ {print $3}' $TARGETDIR/icu/source/common/unicode/uvernum.h)"
 patch -d $TARGETDIR -p1 < $ROOTDIR/patches/icu.patch
 
+# use compiled .dat archive from Android Chromium
+cp $TARGETDIR/icu/android/icudtl.dat $TARGETDIR/icu/source/data/in/icudt${ICU_VERSION_MAJOR}l.dat
+rm $TARGETDIR/icu/source/data/translit/root_subset.txt $TARGETDIR/icu/source/data/translit/trnslocal.mk
+
 rm -rf $TARGETDIR/icu/host
 mkdir -p $TARGETDIR/icu/host
 cd $TARGETDIR/icu/host
-$TARGETDIR/icu/source/runConfigureICU Linux --prefix=$PWD/prebuilts CFLAGS="-Os" CXXFLAGS="--std=c++11"
+$TARGETDIR/icu/source/runConfigureICU Linux --prefix=$PWD/prebuilts CFLAGS="-Os" CXXFLAGS="--std=c++11" --disable-tests --disable-samples
 make -j5
 cd $ROOTDIR
 
 echo "=============== patch jsc ====================="
 patch -d $TARGETDIR -p1 < $ROOTDIR/patches/jsc.patch
+
+# conditional patch
+if [[ "$npm_package_config_i18n" = false ]]; then
+  patch -d $TARGETDIR -N -p1 < $ROOTDIR/patches/intl/icu-disabled.patch
+fi
+
+#remove icu headers from WTF, so it won't use them instead of the ones from icu/host/common
+rm -rf "$TARGETDIR"/webkit/Source/WTF/icu
 echo "orig: $(find $ROOTDIR/build/target | grep \.orig || true)"

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`},`
`29`	`29`	`"config": {`
`30`	`30`	`"webkitGTK": "2.18.2",`
`31`		`- "androidICU": "8.0.0_r34",`
	`31`	`+ "chromiumICUCommit": "b34251f8b762f8e2112a89c587855ca4297fed96",`
`32`	`32`	`"i18n": false`
`33`	`33`	`}`
`34`	`34`	`}`