ooo-build r15190 - in trunk: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Jan 28 03:59:07 2009
New Revision: 15190
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15190&view=rev

Log:
2009-01-27  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/speed-hash-style-m39.diff:
	* patches/dev300/speed-hash-style.diff:	
	* patches/dev300/speed-symbolic-functions-m39.diff:
	* patches/dev300/speed-symbolic-functions.diff:
	* patches/dev300/apply: adjusted for dev300-m40.
	config_office-liblayout-libfonts.diff appears to have been integrated in
	dev300-m40.


Added:
   trunk/patches/dev300/speed-hash-style-m39.diff   (props changed)
      - copied unchanged from r15185, /trunk/patches/dev300/speed-hash-style.diff
   trunk/patches/dev300/speed-symbolic-functions-m39.diff
      - copied unchanged from r15185, /trunk/patches/dev300/speed-symbolic-functions.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/speed-hash-style.diff
   trunk/patches/dev300/speed-symbolic-functions.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jan 28 03:59:07 2009
@@ -1561,16 +1561,25 @@
 # FIXME: is anybody using this feature?
 #FIXME src680: separate-helpcontent.diff, jholesov
 
+[ BuildBits <= dev300-m39 ]
 # use --hash-style=gnu linking when supported
 # disabled for Debian as Debian policy (for now) is to use=both
-speed-hash-style.diff, pmladek
+speed-hash-style-m39.diff, pmladek
 
 # bind all those function / named relocations locally
-speed-symbolic-functions.diff, i#85679, pmladek
+speed-symbolic-functions-m39.diff, i#85679, pmladek
 
-# fix configure.in
+# fix configure.in (exists in dev300-m40)
 config_office-liblayout-libfonts.diff
 
+[ BuildBits > dev300-m39 ]
+# use --hash-style=gnu linking when supported
+# disabled for Debian as Debian policy (for now) is to use=both
+speed-hash-style.diff, pmladek
+
+# bind all those function / named relocations locally
+speed-symbolic-functions.diff, i#85679, pmladek
+
 [ MandrivaOnly ]
 SectionOwner => gghibo
 # mozilla-firefox.diff

Modified: trunk/patches/dev300/speed-hash-style.diff
==============================================================================
--- trunk/patches/dev300/speed-hash-style.diff	(original)
+++ trunk/patches/dev300/speed-hash-style.diff	Wed Jan 28 03:59:07 2009
@@ -1,5 +1,5 @@
---- config_office/configure.in	2008-10-01 12:42:32.000000000 +0200
-+++ config_office/configure.in	2008-10-01 12:55:52.000000000 +0200
+--- configure.in.old	2008-10-01 12:42:32.000000000 +0200
++++ configure.in	2008-10-01 12:55:52.000000000 +0200
 @@ -540,6 +540,9 @@
                            libxul (default), xulrunner, firefox, seamonkey,
                            mozilla
@@ -30,8 +30,8 @@
  
  dnl ===================================================================
  dnl  Test the IRIX SGI Mips pro compiler
---- config_office/set_soenv.in	2008-10-01 12:34:41.000000000 +0200
-+++ config_office/set_soenv.in	2008-10-01 12:59:18.000000000 +0200
+--- set_soenv.in.old	2008-10-01 12:34:41.000000000 +0200
++++ set_soenv.in	2008-10-01 12:59:18.000000000 +0200
 @@ -1966,6 +1966,7 @@
  ToFile( "HAVE_GCC_VISIBILITY_BROKEN",
  		"@HAVE_GCC_VISIBILITY_BROKEN@", "e" );

Modified: trunk/patches/dev300/speed-symbolic-functions.diff
==============================================================================
--- trunk/patches/dev300/speed-symbolic-functions.diff	(original)
+++ trunk/patches/dev300/speed-symbolic-functions.diff	Wed Jan 28 03:59:07 2009
@@ -1,5 +1,5 @@
---- config_office/configure.in.old	2008-01-28 18:31:50.000000000 +0100
-+++ config_office/configure.in	2008-01-28 18:45:05.000000000 +0100
+--- configure.in.old	2008-01-28 18:31:50.000000000 +0100
++++ configure.in	2008-01-28 18:45:05.000000000 +0100
 @@ -1570,6 +1551,29 @@ fi
  AC_SUBST(WITH_LINKER_HASH_STYLE)
  
@@ -30,8 +30,8 @@
  dnl  Test the IRIX SGI Mips pro compiler
  dnl ===================================================================
  if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
---- config_office/set_soenv.in.old	2008-01-28 17:13:14.000000000 +0100
-+++ config_office/set_soenv.in	2008-01-28 18:47:05.000000000 +0100
+--- set_soenv.in.old	2008-01-28 17:13:14.000000000 +0100
++++ set_soenv.in	2008-01-28 18:47:05.000000000 +0100
 @@ -1924,6 +1924,8 @@ ToFile( "HAVE_GCC_VISIBILITY_FEATURE",
  		"@HAVE_GCC_VISIBILITY_BROKEN@", "e" );
  ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_HASH_STYLE@","e" );