[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/speed-hash-style.diff |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit e976ca8a45c4f268058483991a0ee753b3549ce8
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Aug 11 14:44:47 2009 +0300

    Adapt speed-hash-style.diff to dev300-m54
    
    * patches/dev300/speed-hash-style.diff: Adapt to dev300-m54.

diff --git a/patches/dev300/speed-hash-style.diff b/patches/dev300/speed-hash-style.diff
index f98aa17..75f58f1 100644
--- a/patches/dev300/speed-hash-style.diff
+++ b/patches/dev300/speed-hash-style.diff
@@ -30,16 +30,16 @@
  
  dnl ===================================================================
  dnl  Test the IRIX SGI Mips pro compiler
---- set_soenv.in.old	2008-10-01 12:34:41.000000000 +0200
-+++ set_soenv.in	2008-10-01 12:59:18.000000000 +0200
+--- set_soenv.in
++++ set_soenv.in
 @@ -1966,6 +1966,7 @@
  ToFile( "HAVE_GCC_VISIBILITY_BROKEN",
  		"@HAVE_GCC_VISIBILITY_BROKEN@", "e" );
  ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_HASH_STYLE@","e" );
 +ToFile( "WITH_LINKER_HASH_STYLE","@WITH_LINKER_HASH_STYLE@","e" );
+ ToFile( "HAVE_LD_BSYMBOLIC_FUNCTIONS",
+ 		"@HAVE_LD_BSYMBOLIC_FUNCTIONS@","e" );
  ToFile( "CXX",               $CXX,               "e" );
- ToFile( "MINGWCXX",          "@MINGWCXX@",       "e" );
- ToFile( "MINGWSTRIP",        "@MINGWSTRIP@",     "e" );
 --- solenv/inc/unxlngi6.mk	2008-10-01 12:42:32.000000000 +0200
 +++ solenv/inc/unxlngi6.mk	2008-10-01 13:00:26.000000000 +0200
 @@ -199,7 +199,7 @@
@@ -73,19 +73,19 @@
  .ELSE
  LINKFLAGS += -Wl,-zdynsort
  .ENDIF
---- solenv/inc/unxlngx6.mk	2008-10-01 12:42:32.000000000 +0200
-+++ solenv/inc/unxlngx6.mk	2008-10-01 13:01:31.000000000 +0200
+--- solenv/inc/unxlngx6.mk
++++ solenv/inc/unxlngx6.mk
 @@ -80,7 +80,7 @@
- 
  .ENDIF
+ 
  .IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
 -LINKFLAGS += -Wl,--hash-style=both
 +LINKFLAGS += -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
  .ELSE
  LINKFLAGS += -Wl,-zdynsort
  .ENDIF
---- stlport/makefile.mk	2008-10-01 12:42:32.000000000 +0200
-+++ stlport/makefile.mk	2008-10-01 13:03:03.000000000 +0200
+--- stlport/makefile.mk
++++ stlport/makefile.mk
 @@ -164,7 +164,7 @@
  	BUILD_FLAGS+= -j$(MAXPROCESS)
  .ENDIF
@@ -94,4 +94,4 @@
 +CXX+= -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
  .ENDIF
  
- .IF "$(COM)"=="C52"
+ .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)"  == "TRUE"