ooo-build r12557 - trunk/patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Fri May 16 15:24:01 2008
New Revision: 12557
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12557&view=rev

Log:
2008-05-16  Petr Mladek  <pmladek suse cz>

	* ooo-build/patches/dev300/link-as-needed.diff:
	* ooo-build/patches/dev300/link-as-needed-bf.diff:
	* ooo-build/patches/dev300/apply: # use -Wl,--as-needed, save 1% of
	  relocations; Caolan's fix; i#89511



Added:
   trunk/patches/dev300/link-as-needed-bf.diff
   trunk/patches/dev300/link-as-needed.diff
Modified:
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri May 16 15:24:01 2008
@@ -400,6 +400,9 @@
 # more secure permissions for the user directory by default
 desktop-safer-user-dir-perm.diff, i#62858, pmladek
 
+# use -Wl,--as-needed, save 1% of relocations
+link-as-needed.diff, i#89511, pmladek
+
 [ Fixes < dev300-m11 ]
 # fixes some wrong usages of the function AddBytes that would malform the xml output
 sax-writer.diff, i#66693, pmladek
@@ -1163,6 +1166,8 @@
 # STLport fixes
 binfilter-stl.diff, i#63770, hmth
 
+# use -Wl,--as-needed, save 1% of relocations
+link-as-needed-bf.diff, i#89511, pmladek
 
 [ SystemBuildBits ]
 SectionOwner => fridrich

Added: trunk/patches/dev300/link-as-needed-bf.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/link-as-needed-bf.diff	Fri May 16 15:24:01 2008
@@ -0,0 +1,23 @@
+Index: filter/source/bf_offwrp/makefile.mk
+===================================================================
+RCS file: /cvs/framework/binfilter/filter/source/bf_offwrp/makefile.mk,v
+retrieving revision 1.15
+diff -u -r1.15 makefile.mk
+--- binfilter/filter/source/bf_offwrp/makefile.mk	10 Apr 2008 21:16:58 -0000	1.15
++++ binfilter/filter/source/bf_offwrp/makefile.mk	14 May 2008 16:19:23 -0000
+@@ -57,7 +57,6 @@
+ SHL1STDLIBS=    \
+ 				$(FWELIB)			\
+ 				$(BFBASICLIB) 		\
+-				$(BFSO3LIB) 			\
+ 				$(SJLIB) 			\
+ 				$(TKLIB) 			\
+ 				$(BFSVTOOLLIB) 		\
+@@ -75,6 +74,7 @@
+ 				$(BFSDLIB)          \
+ 				$(BFSCLIB)          \
+ 				$(BFSVXLIB)         \
++				$(BFSO3LIB) 			\
+ 				$(UNOTOOLSLIB)		\
+ 				$(COMPHELPERLIB)	\
+ 				$(LEGACYSMGRLIB)

Added: trunk/patches/dev300/link-as-needed.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/link-as-needed.diff	Fri May 16 15:24:01 2008
@@ -0,0 +1,32 @@
+Index: inc/unxlngi6.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/unxlngi6.mk,v
+retrieving revision 1.45
+diff -u -r1.45 unxlngi6.mk
+--- solenv/inc/unxlngi6.mk	10 Apr 2008 17:49:25 -0000	1.45
++++ solenv/inc/unxlngi6.mk	15 May 2008 13:29:59 -0000
+@@ -146,7 +146,7 @@
+ LINKC*=$(CC)
+ 
+ # default linker flags
+-LINKFLAGSDEFS*=-Wl,-z,defs
++LINKFLAGSDEFS*=-Wl,-z,defs -Wl,--as-needed
+ LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'
+ LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
+     #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
+Index: inc/unxlngx6.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/unxlngx6.mk,v
+retrieving revision 1.15
+diff -u -r1.15 unxlngx6.mk
+--- solenv/inc/unxlngx6.mk	10 Apr 2008 17:52:03 -0000	1.15
++++ solenv/inc/unxlngx6.mk	15 May 2008 13:30:00 -0000
+@@ -154,7 +154,7 @@
+ LINKC*=$(CC)
+ 
+ # default linker flags
+-LINKFLAGSDEFS*=-Wl,-z,defs
++LINKFLAGSDEFS*=-Wl,-z,defs -Wl,--as-needed
+ LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'
+ LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
+     #TODO: drop $ORIGIN once no URE executable is also shipped in OOo