ooo-build r11443 - in trunk: . patches/src680
- From: pmladek svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r11443 - in trunk: . patches/src680
- Date: Tue, 29 Jan 2008 13:53:40 +0000 (GMT)
Author: pmladek
Date: Tue Jan 29 13:53:39 2008
New Revision: 11443
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11443&view=rev
Log:
2008-01-29 Petr Mladek <pmladek suse cz>
* patches/src680/speed-symbolic-functions.diff, patches/src680/apply:
enable -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new
-Wl,--dynamic-list-cpp-typeinfo when supported
* patches/src680/speed-bdirect.diff, patches/src680/apply: apply in
the common section after speed-symbolic-functions.diff; note that
the -DBdirect is not longer supported by the recent linker
* ooo-build/patches/src680/link-symb-funct.diff: bin; obsoleted by
speed-symbolic-functions.diff
* patches/src680/build-java-target.diff: fix to work also for the rhino
module
Added:
trunk/patches/src680/speed-symbolic-functions.diff
Removed:
trunk/patches/src680/link-symb-funct.diff
Modified:
trunk/ChangeLog
trunk/patches/src680/apply
trunk/patches/src680/build-java-target.diff
trunk/patches/src680/speed-bdirect.diff
Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply (original)
+++ trunk/patches/src680/apply Tue Jan 29 13:53:39 2008
@@ -1047,6 +1047,12 @@
# allow separate helpcontent build
#FIXME src680: separate-helpcontent.diff, jholesov
+# bind all those function / named relocations locally
+speed-symbolic-functions.diff
+
+# Use -Bdirect linking - this is a really marginal win.
+speed-bdirect.diff, i#58119, brosenk
+
[ MandrivaOnly ]
SectionOwner => gghibo
@@ -1055,9 +1061,6 @@
[ ArkOnly ]
SectionOwner => brosenk
-# Use -Bdirect linking - this is a really marginal win.
-speed-bdirect.diff, i#58119, brosenk
-
# Db 4.3/4.4 needs -lpthread
system-db-4.3-use-lpthread.diff, i#58474, rengelha
@@ -1269,8 +1272,6 @@
vcl_font-NO_LIST.diff
# linux-headers-2.6.22 issue?!
linux-headers.diff
-# Use -Bdirect linking - this is a really marginal win.
-speed-bdirect.diff, i#58119, brosenk
[ DebianBaseOnly ]
SectionOwner => rengelha
Modified: trunk/patches/src680/build-java-target.diff
==============================================================================
--- trunk/patches/src680/build-java-target.diff (original)
+++ trunk/patches/src680/build-java-target.diff Tue Jan 29 13:53:39 2008
@@ -258,8 +258,8 @@
+ @echo java disabled
+.ENDIF
dummy line to avoid confusing diff-mode
---- hsqldb/patches/accumulated_patches.patch 18 Jan 2008 12:52:49 -0000 1.1.6.2
-+++ hsqldb/patches/accumulated_patches.patch 23 Jan 2008 20:16:11 -0000
+--- hsqldb/patches/accumulated_patches.patch.old 2008-01-29 12:13:28.000000000 +0100
++++ hsqldb/patches/accumulated_patches.patch 2008-01-29 12:11:22.000000000 +0100
@@ -55,3 +55,176 @@
}
@@ -319,10 +319,10 @@
+!
+! ALLTAR : ANTBUILD
+diff -crN misc/hsqldb/build/build.xml misc/build/hsqldb/build/build.xml
-+*** misc/hsqldb/build/build.xml 2006-11-28 12:27:49.000000000 +0100
-+--- misc/build/hsqldb/build/build.xml 2006-11-28 12:37:10.000000000 +0100
++*** misc/hsqldb/build/build.xml.orig 2007-10-22 16:17:31.000000000 +0200
++--- misc/build/hsqldb/build/build.xml 2008-01-29 12:10:02.000000000 +0100
+***************
-+*** 135,141 ****
++*** 132,138 ****
+
+ <target name="codeswitcher" depends="-prepare"
+ description="uses +-JDBC2 +-JDBC2 +-JAVA2">
@@ -330,7 +330,7 @@
+ <src path="${src}"/>
+ <include name="org/hsqldb/util/CodeSwitcher.java"/>
+ </javac>
-+--- 135,141 ----
++--- 132,138 ----
+
+ <target name="codeswitcher" depends="-prepare"
+ description="uses +-JDBC2 +-JDBC2 +-JAVA2">
@@ -339,153 +339,222 @@
+ <include name="org/hsqldb/util/CodeSwitcher.java"/>
+ </javac>
+***************
-+*** 268,273 ****
-+--- 268,275 ----
++*** 258,263 ****
++--- 258,265 ----
++ description="compiles the /store folder">
++ <javac srcdir="${src}"
+ destdir="classes"
+++ source="${java.source.ver}"
+++ target="${java.target.ver}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
-++ source="${java.source.ver}"
-++ target="${java.target.ver}"
+ >
-+ <include name="org/hsqldb/store/**"/>
-+ </javac>
+***************
-+*** 279,284 ****
-+--- 281,288 ----
++*** 269,274 ****
++--- 271,278 ----
++ description="compiles the /lib folder">
++ <javac srcdir="${src}"
+ destdir="classes"
+++ source="${java.source.ver}"
+++ target="${java.target.ver}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
-++ source="${java.source.ver}"
-++ target="${java.target.ver}"
+ >
-+ <include name="org/hsqldb/lib/**"/>
-+ <include name="org/hsqldb/lib/java/**"/>
+***************
-+*** 291,296 ****
-+--- 295,302 ----
++*** 281,286 ****
++--- 285,292 ----
++ description="compiles all the classes">
++ <javac srcdir="${src}"
+ destdir="classes"
+++ source="${java.source.ver}"
+++ target="${java.target.ver}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
-++ source="${java.source.ver}"
-++ target="${java.target.ver}"
+ >
-+ <classpath>
-+ <pathelement location="lib/servlet.jar"/>
+***************
-+*** 326,331 ****
-+--- 332,339 ----
++*** 315,320 ****
++--- 321,328 ----
++ description="compiles 1.2 specific classes">
++ <javac srcdir="${src}"
+ destdir="classes"
+++ source="${java.source.ver}"
+++ target="${java.target.ver}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
-++ source="${java.source.ver}"
-++ target="${java.target.ver}"
+ >
-+ <include name="org/hsqldb/jdbc/jdbcBlob.java"/>
-+ <include name="org/hsqldb/jdbc/jdbcClob.java"/>
+***************
-+*** 338,343 ****
-+--- 346,353 ----
++*** 327,332 ****
++--- 335,342 ----
++ description="compiles 1.4 specific classes">
++ <javac srcdir="${src}"
+ destdir="classes"
+++ source="${java.source.ver}"
+++ target="${java.target.ver}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
-++ source="${java.source.ver}"
-++ target="${java.target.ver}"
+ >
-+ <include name="org/hsqldb/jdbc/jdbcDataSource*.java"/>
-+ <include name="org/hsqldb/jdbc/jdbcParameterMetaData.java"/>
+***************
-+*** 359,364 ****
-+--- 369,376 ----
++*** 343,348 ****
++--- 353,360 ----
++ description="compiles 1.4-specific test classes">
++ <javac srcdir="${src}"
+ destdir="classes"
+++ source="${java.source.ver}"
+++ target="${java.target.ver}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
-++ source="${java.source.ver}"
-++ target="${java.target.ver}"
+ classpath="lib/junit.jar"
-+ >
-+ <include name="org/hsqldb/test/TestJDBCSavepoints.java"/>
+***************
-+*** 373,378 ****
-+--- 385,392 ----
++*** 357,362 ****
++--- 369,376 ----
++ description="compiles the /util folder">
++ <javac srcdir="${src}"
+ destdir="classes"
+++ source="${java.source.ver}"
+++ target="${java.target.ver}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
-++ source="${java.source.ver}"
-++ target="${java.target.ver}"
+ >
-+ <include name="org/hsqldb/util/**"/>
-+ <exclude name="org/hsqldb/util/*Swing.java"/>
+***************
-+*** 389,394 ****
-+--- 403,410 ----
++*** 373,378 ****
++--- 387,394 ----
++ description="compiles the swing based classes in the /util folder">
++ <javac srcdir="${src}"
+ destdir="classes"
+++ source="${java.source.ver}"
+++ target="${java.target.ver}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
-++ source="${java.source.ver}"
-++ target="${java.target.ver}"
+ >
-+ <include name="org/hsqldb/util/*Swing.java"/>
-+ <include name="org/hsqldb/util/TableSorter.java"/>
+***************
-+*** 404,409 ****
-+--- 420,427 ----
++*** 388,393 ****
++--- 404,411 ----
++ message="'junit.jar' must reside in the /lib directory in order to use this target"/>
++ <javac srcdir="${src}"
+ destdir="classes"
+++ source="${java.source.ver}"
+++ target="${java.target.ver}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
-++ source="${java.source.ver}"
-++ target="${java.target.ver}"
+ >
-+ <classpath>
-+ <pathelement location="lib/junit.jar"/>
dummy line to avoid confusing diff-mode
---- rhino/rhino1_5R4.patch.old 2006-08-17 09:09:37.000000000 +0200
-+++ rhino/rhino1_5R4.patch 2006-10-11 18:54:27.000000000 +0200
-@@ -2731,3 +2731,45 @@
- PermissionCollection pc = Policy.getPolicy().getPermissions(cs);
- return new ProtectionDomain(cs, pc);
- }
-+*** misc/rhino1_5R4/src/build.xml 2005-03-22 13:23:46.000000000 +0100
-+--- misc/build/rhino1_5R4/src/build.xml 2006-10-11 18:45:53.000000000 +0200
+--- rhino/makefile.mk.old 2008-01-04 13:29:01.000000000 +0100
++++ rhino/makefile.mk 2008-01-29 12:34:37.000000000 +0100
+@@ -42,7 +42,6 @@ TARGET=ooo_rhino
+ # --- Settings -----------------------------------------------------
+
+ .INCLUDE : settings.mk
+-.INCLUDE : antsettings.mk
+
+ # --- Files --------------------------------------------------------
+
+@@ -50,17 +49,12 @@ TARFILE_NAME=rhino1_5R5
+ TARFILE_ROOTDIR=rhino1_5R5
+
+ ADDITIONAL_FILES= \
++ makefile.mk \
+ toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java
+
+ PATCH_FILE_NAME=rhino1_5R5.patch
+
+-.IF "$(JAVACISGCJ)"=="yes"
+-JAVA_HOME=
+-.EXPORT : JAVA_HOME
+-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj jar
+-.ELSE
+-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" jar
+-.ENDIF
++BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
+
+ # --- Targets ------------------------------------------------------
+
+dummy line to avoid confusing diff-mode
+--- rhino/rhino1_5R5.patch.old 2008-01-02 15:51:18.000000000 +0100
++++ rhino/rhino1_5R5.patch 2008-01-29 12:34:05.000000000 +0100
+@@ -1,3 +1,82 @@
++*** misc/rhino1_5R5//makefile.mk.old 2008-01-29 12:32:48.000000000 +0100
++--- misc/build/rhino1_5R5//makefile.mk 2008-01-29 12:33:22.000000000 +0100
+***************
-+*** 15,21 ****
-+ destdir="${nest}/${build.dest}"
-+ includes="org/**/*.java"
-+ deprecation="on"
-+! debug="${debug}">
-+ </javac>
-+ </target>
-+
-+--- 15,23 ----
-+ destdir="${nest}/${build.dest}"
-+ includes="org/**/*.java"
-+ deprecation="on"
-+! debug="${debug}"
-+! source="${java.source.ver}"
-+! target="${java.target.ver}">
-+ </javac>
-+ </target>
-+
-+*** misc/rhino1_5R4/toolsrc/build.xml 2005-03-22 13:23:46.000000000 +0100
-+--- misc/build/rhino1_5R4/toolsrc/build.xml 2006-10-11 18:44:33.000000000 +0200
++*** 1 ****
++! dummy
++--- 1,47 ----
++! #*************************************************************************
++! #
++! # OpenOffice.org - a multi-platform office productivity suite
++! #
++! # $RCSfile$
++! #
++! # $Revision$
++! #
++! # last change: $Author$ $Date$
++! #
++! # The Contents of this file are made available subject to
++! # the terms of GNU Lesser General Public License Version 2.1.
++! #
++! #
++! # GNU Lesser General Public License Version 2.1
++! # =============================================
++! # Copyright 2005 by Sun Microsystems, Inc.
++! # 901 San Antonio Road, Palo Alto, CA 94303, USA
++! #
++! # This library is free software; you can redistribute it and/or
++! # modify it under the terms of the GNU Lesser General Public
++! # License version 2.1, as published by the Free Software Foundation.
++! #
++! # This library is distributed in the hope that it will be useful,
++! # but WITHOUT ANY WARRANTY; without even the implied warranty of
++! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++! # Lesser General Public License for more details.
++! #
++! # You should have received a copy of the GNU Lesser General Public
++! # License along with this library; if not, write to the Free Software
++! # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++! # MA 02111-1307 USA
++! #
++! #*************************************************************************
++!
++! PRJ=..$/..$/..$/..
++! PRJNAME=ooo_rhino
++! TARGET=ooo_rhino
++!
++! # buildfile is in a subdirectory
++! ANT_BUILDFILE=build.xml
++!
++! .INCLUDE : ant.mk
++!
++! ANT_FLAGS+=-Dbuild.label="build-$(RSCREVISION)" jar
++!
++! ALLTAR : ANTBUILD
++*** misc/rhino1_5R5/src/build.xml.old 2004-03-25 21:54:34.000000000 +0100
++--- misc/build/rhino1_5R5/src/build.xml 2008-01-29 12:18:05.000000000 +0100
+***************
-+*** 65,71 ****
-+ destdir="${nest}/${build.dest}"
++*** 17,22 ****
++--- 17,24 ----
++ destdir="${nest}/${classes}"
+ includes="org/**/*.java"
+ deprecation="on"
-+! debug="${debug}">
+++ source="${java.source.ver}"
+++ target="${java.target.ver}"
++ debug="${debug}">
+ </javac>
-+ </target>
-+
-+--- 65,73 ----
-+ destdir="${nest}/${build.dest}"
++ <copy todir="${nest}/${classes}">
++*** misc/rhino1_5R5/toolsrc/build.xml.old 2008-01-29 10:51:54.000000000 +0100
++--- misc/build/rhino1_5R5/toolsrc/build.xml 2008-01-29 12:21:10.000000000 +0100
++***************
++*** 31,36 ****
++--- 31,38 ----
++ destdir="${nest}/${classes}"
+ includes="org/**/*.java"
+ deprecation="on"
-+! debug="${debug}"
-+! source="${java.source.ver}"
-+! target="${java.target.ver}">
+++ source="${java.source.ver}"
+++ target="${java.target.ver}"
++ debug="${debug}">
+ </javac>
-+ </target>
-+
++ <copy todir="${nest}/${classes}">
+ *** misc/rhino1_5R5/src/org/mozilla/javascript/DefiningClassLoader.java Tue Mar 22 13:20:47 2005
+ --- misc/build/rhino1_5R5/src/org/mozilla/javascript/DefiningClassLoader.java Tue Jul 4 14:59:43 2006
+ ***************
+dummy line to avoid confusing diff-mode
--- scripting/examples/java/build.xml.old 2005-09-09 03:53:51.000000000 +0200
+++ scripting/examples/java/build.xml 2006-10-11 15:30:17.000000000 +0200
@@ -55,7 +55,8 @@
Modified: trunk/patches/src680/speed-bdirect.diff
==============================================================================
--- trunk/patches/src680/speed-bdirect.diff (original)
+++ trunk/patches/src680/speed-bdirect.diff Tue Jan 29 13:53:39 2008
@@ -5,9 +5,9 @@
diff -u -p -u -r1.139 configure.in
--- config_office/configure.in 25 Oct 2005 11:23:57 -0000 1.139
+++ config_office/configure.in 18 Nov 2005 15:00:30 -0000
-@@ -1340,6 +1340,24 @@ if test "$GCC" = "yes"; then
+@@ -1374,6 +1374,24 @@ if test "$GCC" = "yes"; then
fi
- AC_SUBST(HAVE_GCC_VISIBILITY_FEATURE)
+ AC_SUBST(HAVE_LD_BSYMBOLIC_FUNCTIONS)
+if test "$GCC" = "yes"; then
+ AC_MSG_CHECKING( for -Bdirect linker support )
@@ -33,10 +33,10 @@
diff -u -p -u -r1.78 set_soenv.in
--- config_office/set_soenv.in 28 Oct 2005 11:59:53 -0000 1.78
+++ config_office/set_soenv.in 18 Nov 2005 15:00:31 -0000
-@@ -1702,6 +1707,7 @@ ToFile( "JAVAHOME", $JAVAHOME,
- ToFile( "HAVE_GCC_VISIBILITY_FEATURE",
- "@HAVE_GCC_VISIBILITY_FEATURE@", "e" );
+@@ -1926,6 +1926,7 @@ ToFile( "JAVAHOME", $JAVAHOME,
ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_HASH_STYLE@","e" );
+ ToFile( "HAVE_LD_BSYMBOLIC_FUNCTIONS",
+ "@HAVE_LD_BSYMBOLIC_FUNCTIONS@","e" );
+ToFile( "HAVE_LD_BDIRECT", "@HAVE_LD_BDIRECT@","e" );
ToFile( "CXX", $CXX, "e" );
ToFile( "MINGWCXX", "@MINGWCXX@", "e" );
@@ -48,10 +48,10 @@
diff -u -p -u -r1.16 unxlngi6.mk
--- solenv/inc/unxlngi6.mk 5 Oct 2005 11:34:22 -0000 1.16
+++ solenv/inc/unxlngi6.mk 18 Nov 2005 15:03:14 -0000
-@@ -145,6 +145,9 @@ LINKC*=$(CC)
- LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
- # flag -Wl,-z,noexecstack sets the NX bit on the stack
- LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS)
+@@ -160,6 +160,9 @@ LINKC*=$(CC)
+ .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
+ LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
+ .ENDIF
+.IF "$(HAVE_LD_BDIRECT)" == "TRUE"
+LINKFLAGS += -Wl,-Bdirect
+.ENDIF
@@ -61,10 +61,10 @@
--- solenv/inc/unxlngx6.mk.old 2007-01-08 16:14:48.000000000 +0100
+++ solenv/inc/unxlngx6.mk 2007-01-08 16:28:14.000000000 +0100
-@@ -145,6 +145,9 @@
- #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
- LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
- LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
+@@ -170,6 +170,9 @@
+ .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
+ LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
+ .ENDIF
+.IF "$(HAVE_LD_BDIRECT)" == "TRUE"
+LINKFLAGS += -Wl,-Bdirect
+.ENDIF
@@ -78,8 +78,8 @@
diff -u -p -u -r1.27 makefile.mk
--- icu/makefile.mk 7 Sep 2005 17:43:26 -0000 1.27
+++ icu/makefile.mk 29 Nov 2005 14:11:41 -0000
-@@ -64,9 +64,13 @@ CXX:=$(COMPATH)$/bin$/CC
- LDFLAGSADD += -Wl,--hash-style=both
+@@ -93,6 +93,10 @@ CXX:=$(COMPATH)$/bin$/CC
+ LDFLAGSADD += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
.ENDIF
+.IF "$(HAVE_LD_BDIRECT)" == "TRUE"
@@ -88,13 +88,7 @@
+
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=
-
-
+ CONFIGURE_ACTION=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" ./configure --enable-layout --enable-static --enable-shared=yes $(DISABLE_64BIT)'
Index: stlport/makefile.mk
===================================================================
RCS file: /cvs/external/stlport/makefile.mk,v
@@ -102,8 +96,8 @@
diff -u -p -u -r1.32 makefile.mk
--- stlport/makefile.mk 8 Sep 2005 07:48:02 -0000 1.32
+++ stlport/makefile.mk 29 Nov 2005 15:03:43 -0000
-@@ -131,6 +131,10 @@ BUILD_FLAGS=-f vc7.mak
- CXX+= -Wl,--hash-style=both
+@@ -162,6 +162,10 @@ BUILD_FLAGS=-f vc7.mak
+ CXX+= -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
.ENDIF
+.IF "$(HAVE_LD_BDIRECT)" == "TRUE"
Added: trunk/patches/src680/speed-symbolic-functions.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/speed-symbolic-functions.diff Tue Jan 29 13:53:39 2008
@@ -0,0 +1,93 @@
+--- 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
+@@ -1355,6 +1355,25 @@ if test "$GCC" = "yes"; then
+ fi
+ AC_SUBST(HAVE_GCC_VISIBILITY_FEATURE)
+
++HAVE_LD_BSYMBOLIC_FUNCTIONS=
++if test "$GCC" = "yes"; then
++ AC_MSG_CHECKING( for -Bsymbolic-functions linker support )
++ bsymbolic_functions_ldflags_save=$LDFLAGS
++ LDFLAGS="$LDFLAGS -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo"
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([
++ #include <stdio.h>
++ ],[
++ printf ("hello world\n");
++ ])], HAVE_LD_BSYMBOLIC_FUNCTIONS=TRUE, [])
++ if test "z$HAVE_LD_BSYMBOLIC_FUNCTIONS" = "zTRUE"; then
++ AC_MSG_RESULT( found )
++ else
++ AC_MSG_RESULT( not found )
++ fi
++ LDFLAGS=$bsymbolic_functions_ldflags_save
++fi
++AC_SUBST(HAVE_LD_BSYMBOLIC_FUNCTIONS)
++
+ dnl ===================================================================
+ dnl Set the ENABLE_PCH variable. (Activate --enable-pch)
+ dnl ===================================================================
+--- 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( "HAVE_LD_BSYMBOLIC_FUNCTIONS",
++ "@HAVE_LD_BSYMBOLIC_FUNCTIONS@","e" );
+ ToFile( "CXX", $CXX, "e" );
+ ToFile( "MINGWCXX", "@MINGWCXX@", "e" );
+ ToFile( "MINGWSTRIP", "@MINGWSTRIP@", "e" );
+--- solenv/inc/unxlngi6.mk.old 2008-01-28 18:31:50.000000000 +0100
++++ solenv/inc/unxlngi6.mk 2008-01-28 18:49:03.000000000 +0100
+@@ -157,6 +157,9 @@ LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$
+ LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
+ # flag -Wl,-z,noexecstack sets the NX bit on the stack
+ LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS)
++.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
++LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
++.ENDIF
+
+ # linker flags for linking applications
+ LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+--- solenv/inc/unxlngx6.mk.old 2008-01-28 18:31:50.000000000 +0100
++++ solenv/inc/unxlngx6.mk 2008-01-28 18:50:33.000000000 +0100
+@@ -167,6 +167,9 @@ LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$
+ #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
+ LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
+ LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
++.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
++LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
++.ENDIF
+
+ # 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
+ CXX+= -Wl,--hash-style=both
+ .ENDIF
+
++.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
++CXX+= -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
++.ENDIF
++
+ .IF "$(COM)"=="C52"
+ BUILD_ACTION=make
+ .IF "$(CCNUMVER)">="00050008"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
