wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 978784 - Stop exporting ICU symbols from xul.dll; r=glandium

Browse Source
This commit is contained in:
Ehsan Akhgari 2014-03-03 22:38:55 -05:00
parent e0c0c0228a
commit 778c2bd873
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CLOBBER
View File

@ -22,4 +22,4 @@
# changes to stick? As of bug 928195, this shouldn't be necessary! Please # changes to stick? As of bug 928195, this shouldn't be necessary! Please
# don't change CLOBBER for WebIDL changes any more. # don't change CLOBBER for WebIDL changes any more.
Update CLOBBER for bug 939672 moves file location and requires clobber build. Update CLOBBER for bug 978784 because it touches the ICU build system.

9
build/autoconf/icu.m4
View File

@ -119,11 +119,8 @@ AC_SUBST(ICU_LIB_NAMES)
AC_SUBST(MOZ_ICU_LIBS) AC_SUBST(MOZ_ICU_LIBS)
if test -n "$ENABLE_INTL_API" -a -z "$MOZ_NATIVE_ICU"; then if test -n "$ENABLE_INTL_API" -a -z "$MOZ_NATIVE_ICU"; then
dnl We build ICU as a static library for non-shared js builds and as a shared library for shared js builds.
if test -z "$MOZ_SHARED_ICU"; then if test -z "$MOZ_SHARED_ICU"; then
AC_DEFINE(U_STATIC_IMPLEMENTATION) AC_DEFINE(U_STATIC_IMPLEMENTATION)
else
AC_DEFINE(U_COMBINED_IMPLEMENTATION)
fi fi
dnl Source files that use ICU should have control over which parts of the ICU dnl Source files that use ICU should have control over which parts of the ICU
dnl namespace they want to use. dnl namespace they want to use.
@ -140,6 +137,12 @@ if test -z "$BUILDING_JS" -o -n "$JS_STANDALONE"; then
if test -n "$ENABLE_INTL_API" -a -z "$MOZ_NATIVE_ICU"; then if test -n "$ENABLE_INTL_API" -a -z "$MOZ_NATIVE_ICU"; then
# Set ICU compile options # Set ICU compile options
ICU_CPPFLAGS="" ICU_CPPFLAGS=""
dnl We build ICU as a static library for non-shared js builds and as a shared library for shared js builds.
if test -z "$MOZ_SHARED_ICU"; then
ICU_CPPFLAGS="$ICU_CPPFLAGS -DU_STATIC_IMPLEMENTATION"
else
ICU_CPPFLAGS="$ICU_CPPFLAGS -DU_COMBINED_IMPLEMENTATION"
fi
# don't use icu namespace automatically in client code # don't use icu namespace automatically in client code
ICU_CPPFLAGS="$ICU_CPPFLAGS -DU_USING_ICU_NAMESPACE=0" ICU_CPPFLAGS="$ICU_CPPFLAGS -DU_USING_ICU_NAMESPACE=0"
# don't include obsolete header files # don't include obsolete header files