ooo-build r12986 - in trunk: . bin patches/dev300

[michael svn gnome org]

Author: michael
Date: Fri Jun 27 13:47:32 2008
New Revision: 12986
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12986&view=rev

Log:
2008-06-27  Michael Meeks  <michael meeks novell com>
        
        * patches/dev300/speed-bdirect.diff,
        * patches/dev300/apply: drop it - it doesn't speed
        things up with --hash-style & it patches icu.

        * patches/dev300/speed-symbolic-functions.diff,
        * patches/dev300/speed-hash-style.diff: drop icu,
        it's in the external package now.



Removed:
   trunk/patches/dev300/speed-bdirect.diff
Modified:
   trunk/ChangeLog
   trunk/bin/unpack
   trunk/download.in
   trunk/patches/dev300/apply
   trunk/patches/dev300/speed-hash-style.diff
   trunk/patches/dev300/speed-symbolic-functions.diff

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Fri Jun 27 13:47:32 2008
@@ -49,7 +49,7 @@
 fi
 
 if test "z$SPLIT" != "z"; then
-	CORE_PKGS="ure base calc l10n writer impress artwork filters testing bootstrap libs-gui libs-core libs-extern extensions postprocess"
+	CORE_PKGS="sdk ure base calc l10n writer impress artwork filters testing bootstrap libs-gui libs-core libs-extern extensions postprocess"
 	for pkg in $CORE_PKGS; do
 		check_tarball "$OOO_SPLIT_PREFIX$pkg.tar.bz2"
 	done

Modified: trunk/download.in
==============================================================================
--- trunk/download.in	(original)
+++ trunk/download.in	Fri Jun 27 13:47:32 2008
@@ -265,6 +265,7 @@
 
 if ($SPLIT) {
     push @files, ( source_file( "ure" ) );
+    push @files, ( source_file( "sdk" ) );
     push @files, ( source_file( "base" ) );
     push @files, ( source_file( "calc" ) );
     push @files, ( source_file( "l10n" ) );

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Jun 27 13:47:32 2008
@@ -754,7 +754,7 @@
 context-autocomplete.diff, i#22961, michael
 
 # Fix casts in db_java_wrap.c
-db4-jni-casting.diff, rengelha
+# db4-jni-casting.diff, rengelha - broken with 'split' ...
 
 # Grouping items in the templates dialog n#106603
 svtools-unsort-template-dialogentries.diff, rodo
@@ -1076,9 +1076,6 @@
 # bind all those function / named relocations locally
 speed-symbolic-functions.diff, i#85679, pmladek
 
-# Use -Bdirect linking - this is a really marginal win.
-speed-bdirect.diff, i#58119, brosenk
-
 # fix configure.in
 config_office-liblayout-libfonts.diff
 

Modified: trunk/patches/dev300/speed-hash-style.diff
==============================================================================
--- trunk/patches/dev300/speed-hash-style.diff	(original)
+++ trunk/patches/dev300/speed-hash-style.diff	Fri Jun 27 13:47:32 2008
@@ -2,7 +2,7 @@
 +++ config_office/configure.in	2007-01-08 16:36:33.000000000 +0100
 @@ -1340,9 +1340,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 )
@@ -12,17 +12,7 @@
     AC_LINK_IFELSE([AC_LANG_PROGRAM([
     #include <stdio.h>
     ],[
---- icu/makefile.mk-old     2007-07-31 15:53:23.000000000 +0200
-+++ icu/makefile.mk 2007-07-31 15:53:31.000000000 +0200
-@@ -86,7 +86,7 @@
- .ENDIF                 # "$(OS)"=="SOLARIS"
-
- .IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
--LDFLAGSADD += -Wl,--hash-style=both
-+LDFLAGSADD += -Wl,--hash-style=gnu
- .ENDIF
 
- CONFIGURE_DIR=source
 --- 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 @@

Modified: trunk/patches/dev300/speed-symbolic-functions.diff
==============================================================================
--- trunk/patches/dev300/speed-symbolic-functions.diff	(original)
+++ trunk/patches/dev300/speed-symbolic-functions.diff	Fri Jun 27 13:47:32 2008
@@ -61,23 +61,6 @@
  
  # linker flags for linking applications
  LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
---- icu/makefile.mk.old	2008-01-28 18:31:50.000000000 +0100
-+++ icu/makefile.mk	2008-01-28 18:51:49.000000000 +0100
-@@ -89,9 +89,13 @@ DISABLE_64BIT=--enable-64bit-libs=no
- LDFLAGSADD += -Wl,--hash-style=both
- .ENDIF
- 
-+.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)"  == "TRUE"
-+LDFLAGSADD += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
-+.ENDIF
-+
- CONFIGURE_DIR=source
- 
--CONFIGURE_ACTION=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS)" ./configure --enable-layout --enable-static --enable-shared=yes $(DISABLE_64BIT)'
-+CONFIGURE_ACTION=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" ./configure --enable-layout --enable-static --enable-shared=yes $(DISABLE_64BIT)'
- 
- #CONFIGURE_FLAGS=--enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no
- CONFIGURE_FLAGS=
 --- stlport/makefile.mk.old	2008-01-28 18:31:50.000000000 +0100
 +++ stlport/makefile.mk	2008-01-28 18:55:27.000000000 +0100
 @@ -158,6 +158,10 @@ BUILD_FLAGS=-f vc7.mak EXFLAGS="/EHa /Zc