mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
805dd78c93
Bug 924839 - Remove a patch already part of ICU 52.1. See http://bugs.icu-project.org/trac/ticket/10283 but also note the relevant code was removed completely upstream. r=glandium * * * Bug 924839 - Remove another patch already part of ICU 52.1. See http://bugs.icu-project.org/trac/ticket/10290 for that. r=gaston * * * Bug 924839 - Remove another patch already in ICU 52.1. See http://bugs.icu-project.org/trac/ticket/10045 for more. r=Norbert * * * Bug 924839 - Remove another patch already applied upstream. See http://bugs.icu-project.org/trac/changeset/32937 for more. r=gaston * * * Bug 924839 - Update the ICU update script to update to 52.1, *without* applying any of our local patches. r=glandium * * * Bug 924839 - Make the ICU update script only do updating within intl/icu/source and nowhere else. r=glandium * * * Bug 924839 - Implement the changes that would be made by |cd intl/; ./update-icu.sh http://source.icu-project.org/repos/icu/icu/tags/release-52-1/;|, run with the prior changesets' changes made (thus not applying any of our local patches). These changes don't actually work without subsequent adjustments, but this provides a codebase upon which those adjustments can be made, for the purpose of generating local patches to be kept in intl/icu-patches/. rs=the-usual-suspects * * * Bug 924839 - Update the bug 899722 local patch to make runConfigureICU not override CC/CXX on BSD systems. r=gaston * * * Bug 924839 - Update the bug 724533 patch that makes ICU builds with MozillaBuild on Windows. r=glandium * * * Bug 924839 - Import an upstream patch fixing the genrb tool to properly handle the -R (--omitCollationRules) option. See http://bugs.icu-project.org/trac/ticket/10043 for the original bug report and a link to the ultimate upstream landing. r=Norbert * * * Bug 924839 - Import the upstream fix for http://bugs.icu-project.org/trac/ticket/10486 so that ICU with -DU_USING_ICU_NAMESPACE=0 will compile on Windows. r=Norbert * * * Bug 924839 - Adjust the update script to update ICU, then to apply all local patches (rather than skipping the second step). Thus if the update script is properly run, now, the final result should be no changes at all to the tree. NOT REVIEWED YET * * * Bug 924839 - Update jstests that depend on CLDR locale data to match CLDR 24. r=Norbert
84 lines
2.9 KiB
Makefile
84 lines
2.9 KiB
Makefile
## -*-makefile-*-
|
|
## Darwin-specific setup (Darwin is the Mac OS X developer preview, successor
|
|
## to Rhapsody, aka Mac OS X Server)
|
|
## Copyright (c) 1999-2012 International Business Machines Corporation and
|
|
## others. All Rights Reserved.
|
|
|
|
## Flags for position independent code
|
|
SHAREDLIBCFLAGS = -dynamic
|
|
SHAREDLIBCXXFLAGS = -dynamic
|
|
SHAREDLIBCPPFLAGS =
|
|
|
|
# Do not export internal methods by default
|
|
LIBCFLAGS += -fvisibility=hidden
|
|
LIBCXXFLAGS += -fvisibility=hidden
|
|
|
|
# Pad out the paths to the maximum possible length
|
|
LD_FLAGS += -headerpad_max_install_names
|
|
|
|
# We do not need to see the stderr message that the archive was made.
|
|
ARFLAGS += -c
|
|
|
|
## Commands to compile
|
|
COMPILE.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -fno-common -c
|
|
COMPILE.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -fno-common -c
|
|
|
|
## Commands to make a shared library
|
|
SHLIB.c= $(CC) -dynamiclib -dynamic $(CFLAGS) $(LDFLAGS) $(LD_SOOPTIONS)
|
|
SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS)
|
|
|
|
## Compiler switches to embed a library name and version information
|
|
ifeq ($(ENABLE_RPATH),YES)
|
|
LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
|
|
else
|
|
LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET))
|
|
endif
|
|
|
|
## Compiler switch to embed a runtime search path
|
|
LD_RPATH=
|
|
LD_RPATH_PRE= -Wl,-rpath,
|
|
|
|
## Environment variable to set a runtime search path
|
|
LDLIBRARYPATH_ENVVAR = DYLD_LIBRARY_PATH
|
|
|
|
GENCCODE_ASSEMBLY=-a gcc-darwin
|
|
|
|
## Shared object suffix
|
|
SO= dylib
|
|
## Non-shared intermediate object suffix
|
|
STATIC_O = ao
|
|
|
|
## Override Versioned target for a shared library.
|
|
FINAL_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION).$(SO)
|
|
MIDDLE_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION_MAJOR).$(SO)
|
|
|
|
## Compilation and dependency rules
|
|
%.$(STATIC_O): $(srcdir)/%.c
|
|
$(call SILENT_COMPILE,$(strip $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS)) -MMD -MT "$*.d $*.o $*.$(STATIC_O)" -o $@ $<)
|
|
%.o: $(srcdir)/%.c
|
|
$(call SILENT_COMPILE,$(strip $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS)) -MMD -MT "$*.d $*.o $*.$(STATIC_O)" -o $@ $<)
|
|
|
|
%.$(STATIC_O): $(srcdir)/%.cpp
|
|
$(call SILENT_COMPILE,$(strip $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS)) -MMD -MT "$*.d $*.o $*.$(STATIC_O)" -o $@ $<)
|
|
%.o: $(srcdir)/%.cpp
|
|
$(call SILENT_COMPILE,$(strip $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS)) -MMD -MT "$*.d $*.o $*.$(STATIC_O)" -o $@ $<)
|
|
|
|
## Versioned libraries rules
|
|
|
|
%.$(SO_TARGET_VERSION_MAJOR).$(SO): %.$(SO_TARGET_VERSION).$(SO)
|
|
$(RM) $@ && ln -s ${<F} $@
|
|
%.$(SO): %.$(SO_TARGET_VERSION_MAJOR).$(SO)
|
|
$(RM) $@ && ln -s ${*F}.$(SO_TARGET_VERSION).$(SO) $@
|
|
|
|
# tzcode option
|
|
TZORIG_EXTRA_CFLAGS=-DSTD_INSPIRED
|
|
|
|
# genren opts
|
|
GENREN_PL_OPTS=-x Mach-O -n '-g' -p '| c++filt'
|
|
|
|
## Remove shared library 's'
|
|
STATIC_PREFIX_WHEN_USED =
|
|
STATIC_PREFIX =
|
|
|
|
## End Darwin-specific setup
|