diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-10-31 07:37:43 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-10-31 07:37:43 +0000 |
| commit | 5ff08c23bf85ed82861dfc535975e1ce39f03f33 (patch) | |
| tree | 8f2647dbf2b0692d1835822893da5a907f6d560a /icu | |
| parent | ff8e63e66403129d00fd0864581f08af9532668b (diff) | |
#i10000# fix for MacOSX added
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/icu-4.0.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/icu/icu-4.0.patch b/icu/icu-4.0.patch index 63a0e8395dcd..f2ef12ac0236 100644 --- a/icu/icu-4.0.patch +++ b/icu/icu-4.0.patch @@ -9,6 +9,56 @@ #define _XOPEN_SOURCE_EXTENDED 1 #endif +--- misc/icu/source/config/mh-darwin Tue Jul 1 03:41:24 2008 ++++ misc/build/icu/source/config/mh-darwin Fri Oct 31 09:13:56 2008 +@@ -1,7 +1,7 @@ + ## -*-makefile-*- + ## Darwin-specific setup (Darwin is the Mac OS X developer preview, successor + ## to Rhapsody, aka Mac OS X Server) +-## Copyright (c) 1999-2008 International Business Machines Corporation and ++## Copyright (c) 1999-2006 International Business Machines Corporation and + ## others. All Rights Reserved. + + ## Flags for position independent code +@@ -25,7 +25,7 @@ + SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) + + ## Compiler switches to embed a library name and version information +-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) ++LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name @executable_path/$(notdir $(FINAL_SO_TARGET)) + + ## Compiler switch to embed a runtime search path + LD_RPATH= +@@ -41,10 +41,6 @@ + ## 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 rules + %.$(STATIC_O): $(srcdir)/%.c + $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< +@@ -76,15 +72,9 @@ + + ## Versioned libraries rules + +-%.$(SO_TARGET_VERSION_MAJOR).$(SO): %.$(SO_TARGET_VERSION).$(SO) ++%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION) + $(RM) $@ && ln -s ${<F} $@ +-%.$(SO): %.$(SO_TARGET_VERSION_MAJOR).$(SO) +- $(RM) $@ && ln -s ${*F}.$(SO_TARGET_VERSION).$(SO) $@ ++%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR) ++ $(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@ + +-# tzcode option +-TZORIG_EXTRA_CFLAGS=-DSTD_INSPIRED +- +-# genren opts +-GENREN_PL_OPTS=-x Mach-O -n '-g' -p '| c++filt' +- + ## End Darwin-specific setup --- misc/icu/source/config/mh-linux 2007-12-12 19:57:36.000000000 +0100 +++ misc/build/icu/source/config/mh-linux 2008-05-21 18:59:13.000000000 +0200 @@ -20,6 +20,14 @@ |