ooo-build r11220 - in trunk: . patches/src680

[brosenk svn gnome org]

Author: brosenk
Date: Tue Jan  8 13:23:44 2008
New Revision: 11220
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11220&view=rev

Log:
Port testing-more-optimizations-ark.diff to OOH680


Modified:
   trunk/ChangeLog
   trunk/patches/src680/testing-more-optimizations-ark.diff

Modified: trunk/patches/src680/testing-more-optimizations-ark.diff
==============================================================================
--- trunk/patches/src680/testing-more-optimizations-ark.diff	(original)
+++ trunk/patches/src680/testing-more-optimizations-ark.diff	Tue Jan  8 13:23:44 2008
@@ -1274,12 +1274,16 @@
  {
  public:
      /** initializes the loader, loads the library and call the initialization fucntion.
---- ./icu/makefile.mk.opt	2005-10-31 16:15:22.000000000 +0000
-+++ ./icu/makefile.mk	2005-10-31 16:31:11.000000000 +0000
-@@ -74,4 +74,4 @@
+--- icu/makefile.mk.ark	2008-01-08 13:26:41.000000000 +0100
++++ icu/makefile.mk	2008-01-08 13:27:07.000000000 +0100
+@@ -77,8 +77,8 @@
+ icu_LDFLAGS+=-Wl,-z,noexecstack
+ .ENDIF
  
--icu_CFLAGS+=-O $(ARCH_FLAGS)
-+icu_CFLAGS+=$(CFLAGSOPT) $(ARCH_FLAGS)
--icu_CXXFLAGS+=-O $(ARCH_FLAGS)
-+icu_CXXFLAGS+=$(CFLAGSOPT) $(ARCH_FLAGS)
+-icu_CFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CFLAGS)
+-icu_CXXFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CFLAGS)
++icu_CFLAGS+=$(CFLAGSOPT) $(ARCH_FLAGS) $(EXTRA_CFLAGS)
++icu_CXXFLAGS+=$(CFLAGSOPT) $(ARCH_FLAGS) $(EXTRA_CFLAGS)
  
+ # until someone introduces SOLARIS 64-bit builds
+ .IF "$(OS)"=="SOLARIS"