ooo-build r14737 - in trunk: . distro-configs patches/dev300

From: rengelhard svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r14737 - in trunk: . distro-configs patches/dev300
Date: Thu, 4 Dec 2008 07:34:33 +0000 (UTC)
Author: rengelhard
Date: Thu Dec  4 07:34:33 2008
New Revision: 14737
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14737&view=rev

Log:
2008-12-04  Rene Engelhard  <rene debian org>

        * merge from ooo-build-3-0:

        * patches/dev300/speed-symbolic-functions.diff,
        patches/dev300/speed-hash-style.diff: introducing
        --with-linker-hash-style option that falls back to "gnu", but one
        can specify "both"

        * distro-configs/GoOoLinux.conf.in: makeing --with-linker-hash-style=both
        default for GoOoLinux.

        * patches/dev300/apply: move speed-hash-style.diff to BuildBits
          because speed-symbolic-functions.diff now patches a place it
          patched before.


Modified:
   trunk/ChangeLog
   trunk/distro-configs/GoOoLinux.conf.in
   trunk/patches/dev300/apply
   trunk/patches/dev300/speed-hash-style.diff
   trunk/patches/dev300/speed-symbolic-functions.diff

Modified: trunk/distro-configs/GoOoLinux.conf.in
==============================================================================
--- trunk/distro-configs/GoOoLinux.conf.in	(original)
+++ trunk/distro-configs/GoOoLinux.conf.in	Thu Dec  4 07:34:33 2008
@@ -34,4 +34,4 @@
 --without-system-xrender-headers
 --without-system-mesa-headers
 --without-unix-wrapper
-
+--with-linker-hash-style=both

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Dec  4 07:34:33 2008
@@ -939,9 +939,6 @@
 # also last comment in: https://bugzilla.novell.com/show_bug.cgi?id=83925
 # also http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=373974
 printer-properties-disable.diff, i#14036, michael
-# use --hash-style=gnu linking when supported
-# disabled for Debian as Debian policy (for now) is to use=both
-speed-hash-style.diff, pmladek
 
 # Enable layout'ed dialogs.  Not to be released, therefore NotDebian.
 layout-default-enable-config_office.diff, janniew
@@ -1233,6 +1230,10 @@
 # FIXME: is anybody using this feature?
 #FIXME src680: separate-helpcontent.diff, jholesov
 
+# 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
 

Modified: trunk/patches/dev300/speed-hash-style.diff
==============================================================================
--- trunk/patches/dev300/speed-hash-style.diff	(original)
+++ trunk/patches/dev300/speed-hash-style.diff	Thu Dec  4 07:34:33 2008
@@ -1,70 +1,97 @@
---- config_office/configure.in.old	2006-11-30 21:09:12.000000000 +0100
-+++ config_office/configure.in	2007-01-08 16:36:33.000000000 +0100
-@@ -1340,9 +1340,9 @@
+--- config_office/configure.in	2008-10-01 12:42:32.000000000 +0200
++++ config_office/configure.in	2008-10-01 12:55:52.000000000 +0200
+@@ -540,6 +540,9 @@
+                           libxul (default), xulrunner, firefox, seamonkey,
+                           mozilla
+ ], WITH_SYSTEM_MOZILLA=$withval, WITH_SYSTEM_MOZILLA=no)
++AC_ARG_WITH(linker-hash-style,
++[  --with-linker-hash-style  
++], WITH_LINKER_HASH_STYLE=$withval, WITH_LINKER_HASH_STYLE=gnu)
+ AC_ARG_WITH(stlport,
+ [  --with-stlport         The location that STLport is installed in. The STL
+                           header files are assumed to be in
+@@ -1563,9 +1566,9 @@
  fi
  
  if test "$GCC" = "yes"; then
 -   AC_MSG_CHECKING( for --hash-style=both linker support )
-+   AC_MSG_CHECKING( for --hash-style=gnu linker support )
++   AC_MSG_CHECKING( for --hash-style=$WITH_LINKER_HASH_STYLE linker support )
     hash_style_ldflags_save=$LDFLAGS
 -   LDFLAGS="$LDFLAGS -Wl,--hash-style=both"
-+   LDFLAGS="$LDFLAGS -Wl,--hash-style=gnu"
++   LDFLAGS="$LDFLAGS -Wl,--hash-style=$WITH_LINKER_HASH_STYLE"
     AC_LINK_IFELSE([AC_LANG_PROGRAM([
     #include <stdio.h>
     ],[
-
---- stlport/makefile.mk-old     2007-07-31 15:54:11.000000000 +0200
-+++ stlport/makefile.mk 2007-07-31 15:54:19.000000000 +0200
-@@ -155,7 +155,7 @@
-        BUILD_FLAGS+= -j$(MAXPROCESS)
- .ENDIF
- .IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
--CXX+= -Wl,--hash-style=both
-+CXX+= -Wl,--hash-style=gnu
- .ENDIF
-
- .IF "$(COM)"=="C52"
---- solenv/inc/unxlngi6.mk-old     2007-07-31 15:57:41.000000000 +0200
-+++ solenv/inc/unxlngi6.mk 2007-07-31 15:57:47.000000000 +0200
+@@ -1579,6 +1582,7 @@
+    LDFLAGS=$hash_style_ldflags_save
+ fi
+ AC_SUBST(HAVE_LD_HASH_STYLE)
++AC_SUBST(WITH_LINKER_HASH_STYLE)
+ 
+ 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
+@@ -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( "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 @@
  STDSHLCUIMT+=-ltcmalloc
  .ENDIF
  .IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
 -LINKFLAGS += -Wl,--hash-style=both
-+LINKFLAGS += -Wl,--hash-style=gnu
++LINKFLAGS += -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
  .ELSE
  LINKFLAGS += -Wl,-zdynsort
  .ENDIF
---- solenv/inc/unxlngppc.mk-old    2007-07-31 15:57:47.000000000 +0200
-+++ solenv/inc/unxlngppc.mk        2007-07-31 15:57:52.000000000 +0200
-@@ -78,7 +78,7 @@
- CFLAGSENABLESYMBOLS=-g
+--- solenv/inc/unxlngppc.mk	2008-10-01 12:42:32.000000000 +0200
++++ solenv/inc/unxlngppc.mk	2008-10-01 13:01:09.000000000 +0200
+@@ -74,7 +74,7 @@
+ CFLAGSENABLESYMBOLS=-g 
  .ENDIF
  .IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
 -LINKFLAGS += -Wl,--hash-style=both
-+LINKFLAGS += -Wl,--hash-style=gnu
++LINKFLAGS += -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
  .ELSE
  LINKFLAGS += -Wl,-zdynsort
  .ENDIF
---- solenv/inc/unxlngs.mk-old      2007-07-31 15:57:52.000000000 +0200
-+++ solenv/inc/unxlngs.mk  2007-07-31 15:57:59.000000000 +0200
-@@ -80,7 +80,7 @@
+--- solenv/inc/unxlngs.mk	2008-10-01 12:42:32.000000000 +0200
++++ solenv/inc/unxlngs.mk	2008-10-01 13:01:17.000000000 +0200
+@@ -76,7 +76,7 @@
  CFLAGSENABLESYMBOLS=-g
  .ENDIF
  .IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
 -LINKFLAGS += -Wl,--hash-style=both
-+LINKFLAGS += -Wl,--hash-style=gnu
++LINKFLAGS += -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
  .ELSE
  LINKFLAGS += -Wl,-zdynsort
  .ENDIF
---- solenv/inc/unxlngx6.mk-old     2007-07-31 15:57:59.000000000 +0200
-+++ solenv/inc/unxlngx6.mk 2007-07-31 15:58:06.000000000 +0200
-@@ -84,7 +84,7 @@
-
+--- solenv/inc/unxlngx6.mk	2008-10-01 12:42:32.000000000 +0200
++++ solenv/inc/unxlngx6.mk	2008-10-01 13:01:31.000000000 +0200
+@@ -80,7 +80,7 @@
+ 
  .ENDIF
  .IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
 -LINKFLAGS += -Wl,--hash-style=both
-+LINKFLAGS += -Wl,--hash-style=gnu
++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
+@@ -164,7 +164,7 @@
+ 	BUILD_FLAGS+= -j$(MAXPROCESS)
+ .ENDIF
+ .IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
+-CXX+= -Wl,--hash-style=both
++CXX+= -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
+ .ENDIF
+ 
+ .IF "$(COM)"=="C52"

Modified: trunk/patches/dev300/speed-symbolic-functions.diff
==============================================================================
--- trunk/patches/dev300/speed-symbolic-functions.diff	(original)
+++ trunk/patches/dev300/speed-symbolic-functions.diff	Thu Dec  4 07:34:33 2008
@@ -1,7 +1,7 @@
 --- 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
 @@ -1570,6 +1551,29 @@ fi
- AC_SUBST(HAVE_LD_HASH_STYLE)
+ AC_SUBST(WITH_LINKER_HASH_STYLE)
  
  dnl ===================================================================
 +dnl  Check for -Bsymbolic-functions linker support
@@ -33,9 +33,9 @@
 --- 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
 @@ -1924,6 +1924,8 @@ ToFile( "HAVE_GCC_VISIBILITY_FEATURE",
- 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" );
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]