diff options
author | Martin Hosken <martin_hosken@sil.org> | 2011-03-04 19:55:17 +0700 |
---|---|---|
committer | Martin Hosken <martin_hosken@sil.org> | 2011-03-10 22:39:00 +0700 |
commit | 945c9208f1b9434e92f95a8412f4fa643aacfdcd (patch) | |
tree | 12ac592ea5e1ab9cbfc301a7d3fbf0c8b89454d9 /icu/icu4c-aix.patch | |
parent | Remove cmake dependency. Statically create graphite library (diff) | |
download | core-945c9208f1b9434e92f95a8412f4fa643aacfdcd.tar.gz core-945c9208f1b9434e92f95a8412f4fa643aacfdcd.zip |
Upgrade to ICU 4.6
Diffstat (limited to 'icu/icu4c-aix.patch')
-rw-r--r-- | icu/icu4c-aix.patch | 65 |
1 files changed, 21 insertions, 44 deletions
diff --git a/icu/icu4c-aix.patch b/icu/icu4c-aix.patch index fa43e8563588..39eaccb6dbbe 100644 --- a/icu/icu4c-aix.patch +++ b/icu/icu4c-aix.patch @@ -1,8 +1,8 @@ --- misc/icu/source/config/mh-aix-gcc 2009-01-15 01:46:10.000000000 -0600 +++ misc/build/icu/source/config/mh-aix-gcc 2010-06-24 20:58:16.000000000 -0500 -@@ -1,85 +1,49 @@ +@@ -1,10 +1,7 @@ ## -*-makefile-*- --## Copyright (c) 2003-2007 IBM, Ken Foskey, and others. All rights reserved. +-## Copyright (c) 2003-2009 IBM, Ken Foskey, and others. All rights reserved. -## -## Aix-specific setup (for gcc) -## @@ -12,6 +12,10 @@ +## Copyright (c) 1999-2006, International Business Machines Corporation and +## others. All Rights Reserved. + # Certain files don't compile in -ansi mode (e.g. umutex.c, toolutil.c, and cdatatst.c) + CFLAGS += -D_ALL_SOURCE +@@ 11,17 +8,13 @@ + ## Commands to generate dependency files -GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) -GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS) @@ -24,9 +28,12 @@ -LINK.c= $(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS) -LINK.cc= $(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS) - +-## Shared library options +-LD_SOOPTIONS= -Wl,-bsymbolic +- -## Commands to make a shared library --SHLIB.c= $(AIX_PREDELETE) $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-bexpall --SHLIB.cc= $(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-bexpall +-SHLIB.c= $(AIX_PREDELETE) $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-bexpall $(LD_OPTIONS) +-SHLIB.cc= $(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-bexpall $(LD_OPTIONS) +## Flags for position independent code +SHAREDLIBCFLAGS = -fPIC +SHAREDLIBCXXFLAGS = -fPIC @@ -35,6 +42,7 @@ +## Additional flags when building libraries and with threads +THREADSCPPFLAGS = -D_REENTRANT -D_THREAD_SAFE +LIBCPPFLAGS = +@@ -28,40 +21,24 @@ ## Compiler switch to embed a runtime search path -LD_RPATH= -I @@ -69,6 +77,7 @@ -FINAL_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION).$(SO) -MIDDLE_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO) -SHARED_OBJECT = $(notdir $(FINAL_SO_TARGET:.$(SO)=.$(SOBJ))) +-SHARED_OBJECT_NO_VERSION = $(basename $(SO_TARGET)).$(SOBJ) - -# The following is for Makefile.inc's use. -ICULIBSUFFIX_VERSION = $(LIB_VERSION_MAJOR) @@ -88,6 +97,7 @@ + #LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET)) +#SH# # We can't depend on MIDDLE_SO_TARGET being set. +#SH# LD_SONAME= +@@ -68,29 +44,8 @@ ## Shared object suffix -SOBJ= so @@ -103,9 +113,13 @@ - -## Build archive from shared object -%.a : %.so -- $(AR) $(ARFLAGS) $@ $< +- ln -f $< $(SHARED_OBJECT_NO_VERSION) +- $(AR) $(ARFLAGS) $@ $(SHARED_OBJECT_NO_VERSION) +- rm -f $(SHARED_OBJECT_NO_VERSION) -$(LIBDIR)/%.a : %.so -- $(AR) $(ARFLAGS) $@ $< +- ln -f $< $(SHARED_OBJECT_NO_VERSION) +- $(AR) $(ARFLAGS) $@ $(SHARED_OBJECT_NO_VERSION) +- rm -f $(SHARED_OBJECT_NO_VERSION) - -## Build import list from export list -%.e : %.exp @@ -115,41 +129,4 @@ ## Compilation rules %.$(STATIC_O): $(srcdir)/%.c -@@ -107,16 +71,19 @@ - [ -s $@ ] || rm -f $@' - - ## Versioned libraries rules --%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO) -- $(RM) $@ && ln -s ${*F}$(SO_TARGET_VERSION).$(SO) $@ --%.$(SO): %$(SO_TARGET_VERSION).$(SO) -- $(RM) $@ && ln -s ${*F}$(SO_TARGET_VERSION).$(SO) $@ - -+%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION) -+ $(RM) $@ && ln -s ${<F} $@ -+%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR) -+ $(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@ -+ -+## Bind internal references - --## BIR - bind with internal references [so app data and icu data doesn't collide] - # LDflags that pkgdata will use --BIR_LDFLAGS= -Wl,-bE:$(NAME).map,-bnoexpall -+BIR_LDFLAGS= -Wl,-Bsymbolic - - # Dependencies [i.e. map files] for the final library --BIR_DEPS= $(NAME).map -+BIR_DEPS= -+ -+## End Linux-specific setup - ---- misc/icu/source/tools/pkgdata/dllmode.c 2010-07-27 09:29:19.000000000 -0500 -+++ misc/build/icu/source/tools/pkgdata/dllmode.c 2010-07-27 09:29:48.000000000 -0500 -@@ -222,7 +222,7 @@ - "\t$(SHLIB.c) -o $@ $(OBJECTS) $(DLL_LDFLAGS)\n\n"); - #endif - --#ifdef U_AIX -+#if 0 - T_FileStream_writeLine(makefile, "$(TARGETDIR)/$(FINAL_SO_TARGET): $(OBJECTS) $(LISTFILES) $(DLL_DEPS)\n" - "\t$(SHLIB.c) -o $(FINAL_SO_TARGET:.$(SO)=.$(SOBJ)) $(OBJECTS) $(DLL_LDFLAGS)\n" - "\t$(AR) $(ARFLAGS) $@ $(FINAL_SO_TARGET:.$(SO)=.$(SOBJ))\n" + |