diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-23 12:32:31 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-30 14:23:14 +0000 |
| commit | ce9bf0f868304a95ace987f90dcf2466e70bfe51 (patch) | |
| tree | 8575d8b0e78cf21b9c8494d49f1c01b3b77d5f89 /icu/icu4c-build.patch | |
| parent | 428ae24e55b1b2d7c9578d0e8ac58bb8e202c3be (diff) | |
upgrade icu to 51.1
Change-Id: I1c0d5ca4b2f88ca48225fcdbeb978f27fa91f7a6
Reviewed-on: https://gerrit.libreoffice.org/2953
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Diffstat (limited to 'icu/icu4c-build.patch')
| -rw-r--r-- | icu/icu4c-build.patch | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/icu/icu4c-build.patch b/icu/icu4c-build.patch index 75c41396140e..cf6e6821f2d1 100644 --- a/icu/icu4c-build.patch +++ b/icu/icu4c-build.patch @@ -41,17 +41,6 @@ "\t.section \".rodata\"\n" "\t.align 8\n" ---- misc/icu/source/common/stringpiece.cpp 2010-09-29 20:37:20.000000000 +0200 -+++ misc/build/icu/source/common/stringpiece.cpp 2011-03-15 10:57:24.722045561 +0100 -@@ -75,7 +75,7 @@ - * Visual Studios 9.0. - * Cygwin with MSVC 9.0 also complains here about redefinition. - */ --#if (!defined(_MSC_VER) || (_MSC_VER > 1500)) && !defined(CYGWINMSVC) -+#if (!defined(_MSC_VER) && !defined(CYGWINMSVC)) - const int32_t StringPiece::npos; - #endif - --- misc/icu/source/config/mh-darwin 2010-09-29 20:37:36.000000000 +0200 +++ misc/build/icu/source/config/mh-darwin 2011-03-15 10:56:26.653056004 +0100 @@ -25,11 +25,7 @@ @@ -75,9 +64,9 @@ -FINAL_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION).$(SO) -MIDDLE_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION_MAJOR).$(SO) - - ## Compilation rules + ## Compilation and dependency rules %.$(STATIC_O): $(srcdir)/%.c - $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< + $(call SILENT_COMPILE,$(strip $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS)) -MMD -MT "$*.d $*.o $*.$(STATIC_O)" -o $@ $<) @@ -80,16 +72,10 @@ ## Versioned libraries rules |