[tor-commits] [tor-browser/tor-browser-45.0.2esr-6.x-1] Bug 13419: Fix ICU cross-compilation for Windows

[gk at torproject.org]

commit 76b0760ee1315c1d726673d99ecd3f277671132b
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Apr 18 09:27:11 2016 +0000

    Bug 13419: Fix ICU cross-compilation for Windows
    
    This patch fixes bug 16874 and 18767 as well.
---
 .mozconfig-mingw                | 3 ---
 build/autoconf/icu.m4           | 4 ----
 config/external/icu/Makefile.in | 2 +-
 intl/icu/source/config/mh-mingw | 4 ++--
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/.mozconfig-mingw b/.mozconfig-mingw
index 392a910..c40881c 100644
--- a/.mozconfig-mingw
+++ b/.mozconfig-mingw
@@ -18,9 +18,6 @@ ac_add_options --enable-update-packaging
 ac_add_options --enable-signmar
 ac_add_options --enable-verify-mar
 
-# ICU seems still to have cross-compiling issues:
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1019744#c19
-ac_add_options --without-intl-api
 # We can't build the sandbox code with mingw-w64:
 # https://bugzilla.mozilla.org/show_bug.cgi?id=1042426
 ac_add_options --disable-sandbox
diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4
index 65d10cd..ada0ed6 100644
--- a/build/autoconf/icu.m4
+++ b/build/autoconf/icu.m4
@@ -79,10 +79,6 @@ if test -n "$USE_ICU"; then
     fi
     MOZ_ICU_VERSION="$version"
 
-    if test "$OS_TARGET" = WINNT; then
-        MOZ_SHARED_ICU=1
-    fi
-
     if test -z "${JS_STANDALONE}" -a -n "${JS_SHARED_LIBRARY}${MOZ_NATIVE_ICU}"; then
         MOZ_SHARED_ICU=1
     fi
diff --git a/config/external/icu/Makefile.in b/config/external/icu/Makefile.in
index 7781b23..b6a57eb 100644
--- a/config/external/icu/Makefile.in
+++ b/config/external/icu/Makefile.in
@@ -26,7 +26,7 @@ ifdef USE_ICU
     else # !MOZ_SHARED_ICU
       ifeq ($(OS_ARCH),WINNT)
         ICU_LIB_RENAME = $(foreach libname,$(ICU_LIB_NAMES),\
-                             cp -p $(DEPTH)/intl/icu/target/lib/s$(libname)$(MOZ_ICU_DBG_SUFFIX).lib $(DEPTH)/intl/icu/target/lib/$(libname)$(MOZ_ICU_DBG_SUFFIX).lib;)
+                             cp -p $(DEPTH)/intl/icu/target/lib/libs$(libname)$(MOZ_ICU_DBG_SUFFIX).a $(DEPTH)/intl/icu/target/lib/lib$(libname)$(MOZ_ICU_DBG_SUFFIX).a;)
       endif
     endif # MOZ_SHARED_ICU
   endif # !MOZ_NATIVE_ICU
diff --git a/intl/icu/source/config/mh-mingw b/intl/icu/source/config/mh-mingw
index 5e6acad..9559c10 100644
--- a/intl/icu/source/config/mh-mingw
+++ b/intl/icu/source/config/mh-mingw
@@ -66,13 +66,13 @@ SO_TARGET_VERSION_SUFFIX =
 endif
 
 # Static library prefix and file extension
-LIBSICU = lib$(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
+LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
 A = a
 
 ## An import library is needed for z/OS and MSVC
 IMPORT_LIB_EXT = .dll.a
 
-LIBPREFIX=
+LIBPREFIX=lib
 
 # Change the stubnames so that poorly working FAT disks and installation programs can work.
 # This is also for backwards compatibility.