--- a/icu/icu.spec Tue Nov 02 11:29:20 2010 +0100
+++ b/icu/icu.spec Thu Nov 04 09:46:19 2010 +0100
@@ -57,6 +57,8 @@
#patches 25, 26 align tests to previous Oracle modifications
Patch25: source_common_testdata_conversion.txt.patch
Patch26: source_test_ccapitst.c.patch
+#Studio 12.1 changed behaviour of 'CC -m64', this patch is needed for proper detection of 64 bit abolities of the compiler
+Patch27: source_configure_64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}
SUNW_Copyright: %{src_name}.copyright
@@ -124,6 +126,7 @@
#%patch24 -p1
%patch25 -p1
%patch26 -p1
+%patch27
#cat Makefile.config.in %{PATCH2} > Makefile.config
#touch Makefile.depend
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/icu/patches/source_configure_64.patch Thu Nov 04 09:46:19 2010 +0100
@@ -0,0 +1,20 @@
+--- source/configure.orig 2010-11-02 13:22:37.415676401 +0100
++++ source/configure 2010-11-02 13:24:28.148510678 +0100
+@@ -3063,7 +3063,7 @@
+ case "${host}" in
+ sparc*-*-solaris*)
+ SPARCV9=`isainfo -n 2>&1 | grep sparcv9`
+- SOL64=`$CXX -m64 2>&1 && $CC -m64 2>&1 | grep -v usage:`
++ SOL64=`$CXX -m64 2>&1 |grep -v Usage && $CC -m64 2>&1 | grep -v usage:`
+ if test -n "$SOL64"; then
+ SOL64=`$CXX -xarch=v9 2>&1 && $CC -xarch=v9 2>&1 | grep -v usage:`
+ if test -z "$SOL64" && test -n "$SPARCV9"; then
+@@ -3086,7 +3086,7 @@
+ i386-*-solaris*)
+ AMD64=`isainfo -n 2>&1 | grep amd64`
+ # The new compiler option
+- SOL64=`$CXX -m64 2>&1 && $CC -m64 2>&1 | grep -v usage:`
++ SOL64=`$CXX -m64 2>&1 | grep -v Usage && $CC -m64 2>&1 | grep -v usage:`
+ if test -z "$SOL64" && test -n "$AMD64"; then
+ CFLAGS="${CFLAGS} -m64"
+ CXXFLAGS="${CXXFLAGS} -m64"