Commit 49647a86 authored by Georg Koppen's avatar Georg Koppen
Browse files

Bug 13419: Fix ICU cross-compilation for Windows 

This patch fixes bug 16874 and 18767 as well.
parent 58342e88

.mozconfig-mingw

+0 −3
Original line number Diff line number Diff line
@@ -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

build/autoconf/icu.m4

+0 −4
Original line number Diff line number Diff line
@@ -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

config/external/icu/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -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

intl/icu/source/config/mh-mingw

+2 −2
Original line number Diff line number Diff line
@@ -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.