[ooo-build-commit] 3 commits - configure.in patches/dev300
Petr Mladek
pmladek at kemper.freedesktop.org
Thu Jun 25 09:01:50 PDT 2009
configure.in | 4
patches/dev300/apply | 6
patches/dev300/link-as-needed.diff | 353 ++++++++++++++++++++++++++++++++++---
3 files changed, 331 insertions(+), 32 deletions(-)
New commits:
commit d5e541d1aa160509cefeb5abcd4fcb1cc3244b86
Author: Petr Mladek <pmladek at suse.cz>
Date: Thu Jun 25 17:56:57 2009 +0200
Better check for the linker version
* patches/dev300/link-as-needed.diff: support more formats of the ld -version
output
diff --git a/patches/dev300/link-as-needed.diff b/patches/dev300/link-as-needed.diff
index 558ef83..160c4d0 100644
--- a/patches/dev300/link-as-needed.diff
+++ b/patches/dev300/link-as-needed.diff
@@ -9,7 +9,7 @@
+HAVE_WORKING_LD_AS_NEEDED=
+if test \( "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes" \) -a "$GCC" = "yes"; then
+ AC_MSG_CHECKING([for working -Wl,--as-needed linker support])
-+ _ld_version=`$CC -Wl,--version 2>&1 | head -n 1 | cut -d " " -f 4`
++ _ld_version=`$CC -Wl,--version 2>&1 | head -n 1 | $SED -e "s|(.*)||" -e "s|^[[^0-9]]*||"`
+ _ld_major=`echo $_ld_version | cut -d"." -f 1`
+ _ld_minor=`echo $_ld_version | cut -d"." -f 2`
+ if test "$_ld_major" -gt 2 || \
commit 1449cec5797c378235223798b151c8926def7274
Author: Petr Mladek <pmladek at suse.cz>
Date: Thu Jun 25 16:16:32 2009 +0200
Always download/unpack OXYGEN_IMAGES_TAR; Icon themes are not optional
* configure.in: always set OXYGEN_IMAGES_TAR
diff --git a/configure.in b/configure.in
index 15d9083..18f890d 100644
--- a/configure.in
+++ b/configure.in
@@ -756,7 +756,6 @@ else
fi
if test "$enable_kde4" != "no"; then
- OXYGEN_IMAGES_TAR=ooo_oxygen_images-2009-06-17.tar.gz
if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin"; then
OOO_WIDGET_FLAGS="$OOO_WIDGET_FLAGS --enable-kde4"
widget_sets="$widget_sets kde4"
@@ -764,6 +763,9 @@ if test "$enable_kde4" != "no"; then
else
OOO_WIDGET_FLAGS="$OOO_WIDGET_FLAGS --disable-kde4"
fi
+
+# Icon themes are not optional
+OXYGEN_IMAGES_TAR=ooo_oxygen_images-2009-06-17.tar.gz
AC_SUBST(OXYGEN_IMAGES_TAR)
if test "$enable_gtk" != "no"; then
commit f7340d1decbecea51f5b3f8071413172e08a4184
Author: Petr Mladek <pmladek at suse.cz>
Date: Thu Jun 25 15:13:48 2009 +0200
Use -Wl,--as-needed only with ld > 2.17 and on more archs (i#89511)
* patches/dev300/link-as-needed.diff: add configure check for the useful
ld versions; use -Wl,--as-needed for more architectures
* patches/dev300/apply: move link-as-needed.diff after
speed-symbolic-functions.diff
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 365f9df..006ea56 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -441,9 +441,6 @@ helpcontent2-auxiliary-cfg.diff, pmladek
# 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
-
# Added support for "application/octet-stream" mime type in package manager
desktop-application-octet-stream-mime-type.diff, i#73301, flr
@@ -1278,6 +1275,9 @@ speed-hash-style.diff, pmladek
# bind all those function / named relocations locally
speed-symbolic-functions.diff, i#85679, pmladek
+# use -Wl,--as-needed, save 1% of relocations
+link-as-needed.diff, i#89511, pmladek
+
[ MandrivaOnly ]
SectionOwner => gghibo
# mozilla-firefox.diff
diff --git a/patches/dev300/link-as-needed.diff b/patches/dev300/link-as-needed.diff
index 014974c..558ef83 100644
--- a/patches/dev300/link-as-needed.diff
+++ b/patches/dev300/link-as-needed.diff
@@ -1,35 +1,332 @@
-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)
+--- configure.in.old 2009-06-24 21:13:57.000000000 +0200
++++ configure.in 2009-06-25 15:05:45.000000000 +0200
+@@ -1622,6 +1622,26 @@ fi
+ AC_SUBST(HAVE_LD_BSYMBOLIC_FUNCTIONS)
+
+ dnl ===================================================================
++dnl Check for -Wl,--as-needed linker support
++dnl ===================================================================
++HAVE_WORKING_LD_AS_NEEDED=
++if test \( "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes" \) -a "$GCC" = "yes"; then
++ AC_MSG_CHECKING([for working -Wl,--as-needed linker support])
++ _ld_version=`$CC -Wl,--version 2>&1 | head -n 1 | cut -d " " -f 4`
++ _ld_major=`echo $_ld_version | cut -d"." -f 1`
++ _ld_minor=`echo $_ld_version | cut -d"." -f 2`
++ if test "$_ld_major" -gt 2 || \
++ test "$_ld_major" -eq 2 -a "$_ld_minor" -gt 17 ; then
++ # there are problems with ld <= 2.17, see also http://www.gentoo.org/proj/en/qa/asneeded.xml
++ HAVE_WORKING_LD_AS_NEEDED=TRUE
++ AC_MSG_RESULT([yes])
++ else
++ AC_MSG_RESULT([no])
++ fi
++fi
++AC_SUBST(HAVE_WORKING_LD_AS_NEEDED)
++
++dnl ===================================================================
+ dnl Test the IRIX SGI Mips pro compiler
+ dnl ===================================================================
+ if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
+--- set_soenv.in.old 2009-06-24 18:41:31.000000000 +0200
++++ set_soenv.in 2009-06-24 21:21:56.000000000 +0200
+@@ -1894,6 +1894,8 @@ ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_H
+ ToFile( "WITH_LINKER_HASH_STYLE","@WITH_LINKER_HASH_STYLE@","e" );
+ ToFile( "HAVE_LD_BSYMBOLIC_FUNCTIONS",
+ "@HAVE_LD_BSYMBOLIC_FUNCTIONS@","e" );
++ToFile( "HAVE_WORKING_LD_AS_NEEDED",
++ "@HAVE_WORKING_LD_AS_NEEDED@","e" );
+ ToFile( "CXX", $CXX, "e" );
+ ToFile( "MINGWCXX", "@MINGWCXX@", "e" );
+ ToFile( "MINGWSTRIP", "@MINGWSTRIP@", "e" );
+diff -purN solenv.old/inc/unxbsdi2.mk solenv/inc/unxbsdi2.mk
+--- solenv.old/inc/unxbsdi2.mk 2008-07-11 16:43:37.000000000 +0200
++++ solenv/inc/unxbsdi2.mk 2009-06-24 21:38:44.000000000 +0200
+@@ -128,6 +128,9 @@ LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$O
+ LINKFLAGSRUNPATH_OXT=
+ LINKFLAGSRUNPATH_NONE=
+ LINKFLAGS=-z combreloc $(LINKFLAGSDEFS)
++.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
++LINKFLAGS += -Wl,--as-needed
++.ENDIF
+ # linker flags for linking applications
+ LINKFLAGSAPPGUI= -Wl,-export-dynamic
+diff -purN solenv.old/inc/unxbsdi.mk solenv/inc/unxbsdi.mk
+--- solenv.old/inc/unxbsdi.mk 2008-04-10 19:45:44.000000000 +0200
++++ solenv/inc/unxbsdi.mk 2009-06-24 21:29:07.000000000 +0200
+@@ -108,6 +108,9 @@ DYNAMIC = -Wl,-Bdynamic
+ LINK*=gcc
# 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)
+ LINKFLAGS=
++.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
++LINKFLAGS += -Wl,--as-needed
++.ENDIF
+
+ # linker flags for linking applications
+ LINKFLAGSAPPGUI= -Wl,-export-dynamic
+diff -purN solenv.old/inc/unxfbsd.mk solenv/inc/unxfbsd.mk
+--- solenv.old/inc/unxfbsd.mk 2008-07-11 16:43:50.000000000 +0200
++++ solenv/inc/unxfbsd.mk 2009-06-24 21:26:25.000000000 +0200
+@@ -150,6 +150,9 @@ LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$O
+ LINKFLAGSRUNPATH_OXT=
+ LINKFLAGSRUNPATH_NONE=
+ LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
++.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
++LINKFLAGS += -Wl,--as-needed
++.ENDIF
+
+ # linker flags for linking applications
+ LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+diff -purN solenv.old/inc/unxirgm.mk solenv/inc/unxirgm.mk
+--- solenv.old/inc/unxirgm.mk 2008-04-10 19:47:57.000000000 +0200
++++ solenv/inc/unxirgm.mk 2009-06-24 21:33:53.000000000 +0200
+@@ -96,6 +96,9 @@ DYNAMIC= -Wl,-Bdynamic
+ #
+ LINK= g++
+ LINKFLAGS= -L/usr/lib32 -Wl,-no_unresolved
++.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
++LINKFLAGS += -Wl,--as-needed
++.ENDIF
+ LINKVERSIONMAPFLAG= -Wl,-exports_file
+
+ LINKFLAGSAPPGUI= $(THREADLIB)
+diff -purN solenv.old/inc/unxirxm3.mk solenv/inc/unxirxm3.mk
+--- solenv.old/inc/unxirxm3.mk 2008-04-10 19:48:32.000000000 +0200
++++ solenv/inc/unxirxm3.mk 2009-06-24 21:33:59.000000000 +0200
+@@ -96,6 +96,9 @@ DYNAMIC= -Wl,-Bdynamic
+ #
+ LINK= CC
+ LINKFLAGS= -L/usr/lib32 -Wl,-no_unresolved
++.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
++LINKFLAGS += -Wl,--as-needed
++.ENDIF
+ LINKVERSIONMAPFLAG= -Wl,-exports_file
+
+ LINKFLAGSAPPGUI= $(THREADLIB)
+diff -purN solenv.old/inc/unxlnga.mk solenv/inc/unxlnga.mk
+--- solenv.old/inc/unxlnga.mk 2008-07-11 16:44:03.000000000 +0200
++++ solenv/inc/unxlnga.mk 2009-06-24 21:39:06.000000000 +0200
+@@ -164,6 +164,9 @@ LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$O
+ LINKFLAGSRUNPATH_OXT=
+ LINKFLAGSRUNPATH_NONE=
+ LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
++.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
++LINKFLAGS += -Wl,--as-needed
++.ENDIF
+
+ # linker flags for linking applications
+ LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+diff -purN solenv.old/inc/unxlngi4.mk solenv/inc/unxlngi4.mk
+--- solenv.old/inc/unxlngi4.mk 2008-07-11 16:44:16.000000000 +0200
++++ solenv/inc/unxlngi4.mk 2009-06-24 21:25:52.000000000 +0200
+@@ -141,6 +141,9 @@ LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$O
+ LINKFLAGSRUNPATH_OXT=
+ LINKFLAGSRUNPATH_NONE=
+ LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
++.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
++LINKFLAGS += -Wl,--as-needed
++.ENDIF
+
+ # linker flags for linking applications
+ LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+diff -purN solenv.old/inc/unxlngi6.mk solenv/inc/unxlngi6.mk
+--- solenv.old/inc/unxlngi6.mk 2009-06-24 18:41:22.000000000 +0200
++++ solenv/inc/unxlngi6.mk 2009-06-24 21:25:06.000000000 +0200
+@@ -161,6 +161,9 @@ LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,comb
+ .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
+ LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
+ .ENDIF
++.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
++LINKFLAGS += -Wl,--as-needed
++.ENDIF
+
+ # linker flags for linking applications
+ LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+diff -purN solenv.old/inc/unxlngm68k.mk solenv/inc/unxlngm68k.mk
+--- solenv.old/inc/unxlngm68k.mk 2008-06-30 17:03:13.000000000 +0200
++++ solenv/inc/unxlngm68k.mk 2009-06-24 21:38:53.000000000 +0200
+@@ -144,6 +144,9 @@ LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORI
+ LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
+ LINKFLAGSRUNPATH_OXT=
+ LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
++.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
++LINKFLAGS += -Wl,--as-needed
++.ENDIF
+
+ # linker flags for linking applications
+ LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+diff -purN solenv.old/inc/unxlngmips.mk solenv/inc/unxlngmips.mk
+--- solenv.old/inc/unxlngmips.mk 2008-06-09 14:38:46.000000000 +0200
++++ solenv/inc/unxlngmips.mk 2009-06-24 21:34:56.000000000 +0200
+@@ -175,6 +175,9 @@ LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$O
+ LINKFLAGSRUNPATH_OXT=
+ LINKFLAGSRUNPATH_NONE=
+ LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
++.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
++LINKFLAGS += -Wl,--as-needed
++.ENDIF
+
+ # linker flags for linking applications
+ LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+diff -purN solenv.old/inc/unxlngp.mk solenv/inc/unxlngp.mk
+--- solenv.old/inc/unxlngp.mk 2008-04-10 19:50:07.000000000 +0200
++++ solenv/inc/unxlngp.mk 2009-06-24 21:36:43.000000000 +0200
+@@ -97,6 +97,10 @@ LINKFLAGSPROF=
+ LINKFLAGSDEBUG=-g
+ LINKFLAGSOPT=
+
++.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
++LINKFLAGS += -Wl,--as-needed
++.ENDIF
++
+ .IF "$(NO_BSYMBOLIC)"==""
+ .IF "$(PRJNAME)" != "envtest"
+ LINKFLAGSSHLGUI+=-Bsymbolic
+diff -purN solenv.old/inc/unxlngppc4.mk solenv/inc/unxlngppc4.mk
+--- solenv.old/inc/unxlngppc4.mk 2009-06-24 18:41:22.000000000 +0200
++++ solenv/inc/unxlngppc4.mk 2009-06-24 21:38:59.000000000 +0200
+@@ -138,6 +138,9 @@ LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$O
+ LINKFLAGSRUNPATH_OXT=
+ LINKFLAGSRUNPATH_NONE=
+ LINKFLAGS= $(LINKFLAGSDEFS)
++.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
++LINKFLAGS += -Wl,--as-needed
++.ENDIF
+ # linker flags for linking applications
+ LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+diff -purN solenv.old/inc/unxlngppc.mk solenv/inc/unxlngppc.mk
+--- solenv.old/inc/unxlngppc.mk 2009-06-24 18:41:22.000000000 +0200
++++ solenv/inc/unxlngppc.mk 2009-06-24 21:35:25.000000000 +0200
+@@ -135,6 +135,9 @@ LINK*=$(CXX)
+ 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
+ LINKFLAGS=-Wl,-rpath,\''$$ORIGIN'\'
++.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
++LINKFLAGS += -Wl,--as-needed
++.ENDIF
+
+
+ # linker flags for linking applications
+diff -purN solenv.old/inc/unxlngr.mk solenv/inc/unxlngr.mk
+--- solenv.old/inc/unxlngr.mk 2008-11-10 17:06:12.000000000 +0100
++++ solenv/inc/unxlngr.mk 2009-06-24 21:35:02.000000000 +0200
+@@ -145,6 +145,9 @@ LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$O
+ LINKFLAGSRUNPATH_OXT=
+ LINKFLAGSRUNPATH_NONE=
+ LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
++.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
++LINKFLAGS += -Wl,--as-needed
++.ENDIF
+
+ # linker flags for linking applications
+ LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+diff -purN solenv.old/inc/unxlngs3904.mk solenv/inc/unxlngs3904.mk
+--- solenv.old/inc/unxlngs3904.mk 2008-06-09 14:39:39.000000000 +0200
++++ solenv/inc/unxlngs3904.mk 2009-06-24 21:28:06.000000000 +0200
+@@ -143,6 +143,9 @@ LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$O
+ LINKFLAGSRUNPATH_OXT=
+ LINKFLAGSRUNPATH_NONE=
+ LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
++.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
++LINKFLAGS += -Wl,--as-needed
++.ENDIF
+
+ # linker flags for linking applications
+ LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+diff -purN solenv.old/inc/unxlngs.mk solenv/inc/unxlngs.mk
+--- solenv.old/inc/unxlngs.mk 2009-06-24 18:41:22.000000000 +0200
++++ solenv/inc/unxlngs.mk 2009-06-24 21:28:45.000000000 +0200
+@@ -144,6 +144,9 @@ LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$O
+ LINKFLAGSRUNPATH_OXT=
+ LINKFLAGSRUNPATH_NONE=
+ LINKFLAGS=-z combreloc $(LINKFLAGSDEFS)
++.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
++LINKFLAGS += -Wl,--as-needed
++.ENDIF
+
+ # linker flags for linking applications
+ LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+diff -purN solenv.old/inc/unxlngx6.mk solenv/inc/unxlngx6.mk
+--- solenv.old/inc/unxlngx6.mk 2009-06-24 18:41:22.000000000 +0200
++++ solenv/inc/unxlngx6.mk 2009-06-24 21:26:08.000000000 +0200
+@@ -165,6 +165,9 @@ LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDE
+ .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
+ LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
+ .ENDIF
++.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
++LINKFLAGS += -Wl,--as-needed
++.ENDIF
+
+ # linker flags for linking applications
+ LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+diff -purN solenv.old/inc/unxmacx.mk solenv/inc/unxmacx.mk
+--- solenv.old/inc/unxmacx.mk 2009-06-24 18:41:22.000000000 +0200
++++ solenv/inc/unxmacx.mk 2009-06-24 21:38:13.000000000 +0200
+@@ -206,6 +206,10 @@ LINKFLAGSRUNPATH_OXT=
+ LINKFLAGSRUNPATH_NONE=
+ LINKFLAGS=$(LINKFLAGSDEFS)
+
++.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
++LINKFLAGS += -Wl,--as-needed
++.ENDIF
++
+ # [ed] 5/14/02 If we're building for aqua, add in the objc runtime library into our link line
+ .IF "$(GUIBASE)" == "aqua"
+ LINKFLAGS+=-lobjc
+diff -purN solenv.old/inc/unxsogi.mk solenv/inc/unxsogi.mk
+--- solenv.old/inc/unxsogi.mk 2008-04-10 19:53:35.000000000 +0200
++++ solenv/inc/unxsogi.mk 2009-06-24 21:34:31.000000000 +0200
+@@ -82,6 +82,10 @@ LINK*=$(CXX)
+ LINKC*=$(CC)
+
+ LINKFLAGS=
++.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
++LINKFLAGS += -Wl,--as-needed
++.ENDIF
++
+ LINKFLAGSAPPGUI=-Wl,-export-dynamic
+ LINKFLAGSSHLGUI=-shared
+ LINKFLAGSAPPCUI=-Wl,-export-dynamic
+diff -purN solenv.old/inc/unxsoli4.mk solenv/inc/unxsoli4.mk
+--- solenv.old/inc/unxsoli4.mk 2008-12-30 15:48:34.000000000 +0100
++++ solenv/inc/unxsoli4.mk 2009-06-24 21:27:02.000000000 +0200
+@@ -144,6 +144,9 @@ LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$O
+ LINKFLAGSRUNPATH_OXT=
+ LINKFLAGSRUNPATH_NONE=
+ LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd
++.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
++LINKFLAGS += -Wl,--as-needed
++.ENDIF
+ LINKCFLAGS=-w -mt -z combreloc -norunpath
+
+ # -z text force fatal error if non PIC code is linked into shared library. Such code
+diff -purN solenv.old/inc/unxsols4.mk solenv/inc/unxsols4.mk
+--- solenv.old/inc/unxsols4.mk 2008-12-30 15:48:34.000000000 +0100
++++ solenv/inc/unxsols4.mk 2009-06-24 21:34:43.000000000 +0200
+@@ -150,6 +150,9 @@ LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$O
+ LINKFLAGSRUNPATH_OXT=
+ LINKFLAGSRUNPATH_NONE=
+ LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd
++.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
++LINKFLAGS += -Wl,--as-needed
++.ENDIF
+ LINKCFLAGS=-w -mt -z combreloc -norunpath
+
+ # -z text force fatal error if non PIC code is linked into shared library. Such code
+diff -purN solenv.old/inc/unxsolu4.mk solenv/inc/unxsolu4.mk
+--- solenv.old/inc/unxsolu4.mk 2008-08-27 15:38:26.000000000 +0200
++++ solenv/inc/unxsolu4.mk 2009-06-24 21:25:30.000000000 +0200
+@@ -143,6 +143,9 @@ LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$O
+ LINKFLAGSRUNPATH_OXT=
+ LINKFLAGS=-m64 -w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=stlport4
+ LINKCFLAGS=-m64 -w -mt -z combreloc -norunpath
++.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
++LINKFLAGS += -Wl,--as-needed
++.ENDIF
+
+ # -z text force fatal error if non PIC code is linked into shared library. Such code
+ # would be expensive on startup
--- unodevtools/source/skeletonmaker/makefile.mk 11 Apr 2008 12:33:12 -0000 1.5
+++ unodevtools/source/skeletonmaker/makefile.mk 22 May 2008 15:46:32 -0000
@@ -51,8 +51,9 @@
More information about the ooo-build-commit
mailing list