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 948301 - Fix static ICU build in js standalone builds. r=ted

Browse Source
This commit is contained in:
Mike Hommey 2013-12-18 08:07:11 +09:00
parent b89fd0745d
commit b38cd5c035
1 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
js/src/Makefile.in
View File

@ -124,40 +124,44 @@ include $(topsrcdir)/config/config.mk
# Ensure that this happens before including rules.mk # Ensure that this happens before including rules.mk
ifdef ENABLE_INTL_API ifdef ENABLE_INTL_API
ifndef MOZ_NATIVE_ICU ifndef MOZ_NATIVE_ICU
ifdef MOZ_SHARED_ICU
ifeq ($(OS_ARCH),WINNT)
# Library names: On Windows, ICU uses modified library names for static # Library names: On Windows, ICU uses modified library names for static
# and debug libraries. # and debug libraries.
ifdef MOZ_DEBUG ifeq ($(OS_ARCH),WINNT)
ICU_LIB_SUFFIX=d ifdef MOZ_DEBUG
endif ICU_LIB_SUFFIX=d
ifdef JS_SHARED_LIBRARY endif
ICU_FILES := $(foreach libname,$(ICU_LIB_NAMES),intl/icu/target/lib/$(libname)$(ICU_LIB_SUFFIX)$(MOZ_ICU_VERSION).dll) endif # WINNT
else ifdef MOZ_SHARED_ICU
ICU_LIB_RENAME = $(foreach libname,$(ICU_LIB_NAMES),\ ifeq ($(OS_ARCH),WINNT)
cp -p intl/icu/target/lib/s$(libname)$(ICU_LIB_SUFFIX).lib intl/icu/target/lib/$(libname).lib;) ifdef JS_SHARED_LIBRARY
endif ICU_FILES := $(foreach libname,$(ICU_LIB_NAMES),intl/icu/target/lib/$(libname)$(ICU_LIB_SUFFIX)$(MOZ_ICU_VERSION).dll)
else endif
ifeq ($(OS_ARCH),Darwin) else # ! WINNT
ifdef JS_SHARED_LIBRARY ifeq ($(OS_ARCH),Darwin)
ICU_FILES := $(foreach libname,$(ICU_LIB_NAMES),intl/icu/target/lib/$(DLL_PREFIX)$(libname).$(MOZ_ICU_VERSION)$(DLL_SUFFIX)) ifdef JS_SHARED_LIBRARY
endif ICU_FILES := $(foreach libname,$(ICU_LIB_NAMES),intl/icu/target/lib/$(DLL_PREFIX)$(libname).$(MOZ_ICU_VERSION)$(DLL_SUFFIX))
else endif
ifdef JS_SHARED_LIBRARY else # ! Darwin
ICU_FILES := $(foreach libname,$(ICU_LIB_NAMES),intl/icu/target/lib/$(DLL_PREFIX)$(libname)$(DLL_SUFFIX).$(MOZ_ICU_VERSION)) ifdef JS_SHARED_LIBRARY
endif ICU_FILES := $(foreach libname,$(ICU_LIB_NAMES),intl/icu/target/lib/$(DLL_PREFIX)$(libname)$(DLL_SUFFIX).$(MOZ_ICU_VERSION))
endif endif
endif endif
ifdef ICU_FILES endif # WINNT
ICU_DEST := $(DIST)/bin ifdef ICU_FILES
INSTALL_TARGETS += ICU ICU_DEST := $(DIST)/bin
$(ICU_FILES): buildicu INSTALL_TARGETS += ICU
ICU_TARGET := $(if $(MOZ_PSEUDO_DERECURSE),compile,export) $(ICU_FILES): buildicu
endif ICU_TARGET := $(if $(MOZ_PSEUDO_DERECURSE),compile,export)
endif endif
endif else # !MOZ_SHARED_ICU
endif ifeq ($(OS_ARCH),WINNT)
ICU_LIB_RENAME = $(foreach libname,$(ICU_LIB_NAMES),\
cp -p intl/icu/target/lib/s$(libname)$(ICU_LIB_SUFFIX).lib intl/icu/target/lib/$(libname).lib;)
endif
endif # MOZ_SHARED_ICU
endif # !MOZ_NATIVE_ICU
endif # ENABLE_INTL_API
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
@ -196,6 +200,7 @@ ifdef ENABLE_INTL_API
ifndef MOZ_NATIVE_ICU ifndef MOZ_NATIVE_ICU
ifdef _MSC_VER ifdef _MSC_VER
ifdef MOZ_SHARED_ICU
OS_LIBS += $(call EXPAND_LIBNAME,delayimp) OS_LIBS += $(call EXPAND_LIBNAME,delayimp)
ifdef MOZ_DEBUG ifdef MOZ_DEBUG
EXTRA_DSO_LDOPTS += \ EXTRA_DSO_LDOPTS += \
@ -211,6 +216,7 @@ EXTRA_DSO_LDOPTS += \
$(NULL) $(NULL)
endif endif
endif endif
endif
ifdef .PYMAKE ifdef .PYMAKE
ICU_MAKE = $(GMAKE) ICU_MAKE = $(GMAKE)