--- a/icu/patches/source_config_mh-solaris.patch	Mon Mar 21 16:06:50 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
---- icu/source/config/mh-solaris.orig	2009-05-13 17:24:52.723051477 +0800
-+++ icu/source/config/mh-solaris	2009-05-13 17:24:06.433299572 +0800
-@@ -4,12 +4,24 @@
- ## others. All Rights Reserved.
- 
- ## Flags for position independent code
-+## Sun modification:
-+##SHAREDLIBCFLAGS = -KPIC
-+##SHAREDLIBCXXFLAGS = -KPIC
-+##SHAREDLIBCPPFLAGS = -DPIC
-+SUN_SPARC=$(shell /usr/bin/uname -p)
-+ifeq ($(SUN_SPARC),sparc)
-+SHAREDLIBCFLAGS = -KPIC -xregs=no%appl
-+SHAREDLIBCXXFLAGS = -KPIC -xregs=no%appl
-+else
- SHAREDLIBCFLAGS = -KPIC
- SHAREDLIBCXXFLAGS = -KPIC
--SHAREDLIBCPPFLAGS = -DPIC
-+endif
-+SHAREDLIBCPPFLAGS = -DPIC -D_REENTRANT
- 
- ## Commands to generate dependency files
--GEN_DEPS.c=  $(CC) -xM $(DEFS) $(CPPFLAGS)
-+## Sun modification:
-+##GEN_DEPS.c=  $(CC) -xM $(DEFS) $(CPPFLAGS)
-+GEN_DEPS.c=  $(CC) -xM $(DEFS) $(CPPFLAGS) -xc99=%none
- GEN_DEPS.cc= $(CXX) -xM $(DEFS) $(CPPFLAGS)
- 
- # -mt means 'compiles and links a multithreaded program'
-@@ -34,6 +46,15 @@
- ## Compiler switch to embed a library name
- LD_SONAME = -h $(notdir $(MIDDLE_SO_TARGET))
- 
-+## The type of assembly needed when pkgdata is used for generating shared libraries.
-+## Sun modification:
-+SUN_X86=$(shell /usr/bin/uname -p)
-+ifeq ($(SUN_X86),i386)
-+GENCCODE_ASSEMBLY=-a sun-x86
-+else
-+GENCCODE_ASSEMBLY=-a sun
-+endif
-+
- ## Shared object suffix
- SO=		so
- ## Non-shared intermediate object suffix