merge the formfield patch from ooo-build
[ooovba.git] / applied_patches / 0261-speed-hash-style.diff
blob7f4f891d618fcbb9fbcc3c34c33573132feecc88
1 --- configure.in.old 2008-10-01 12:42:32.000000000 +0200
2 +++ configure.in 2008-10-01 12:55:52.000000000 +0200
3 @@ -540,6 +540,9 @@
4 libxul (default), xulrunner, firefox, seamonkey,
5 mozilla
6 ], WITH_SYSTEM_MOZILLA=$withval, WITH_SYSTEM_MOZILLA=no)
7 +AC_ARG_WITH(linker-hash-style,
8 +[ --with-linker-hash-style
9 +], WITH_LINKER_HASH_STYLE=$withval, WITH_LINKER_HASH_STYLE=gnu)
10 AC_ARG_WITH(stlport,
11 [ --with-stlport The location that STLport is installed in. The STL
12 header files are assumed to be in
13 @@ -1563,9 +1566,9 @@
16 if test "$GCC" = "yes"; then
17 - AC_MSG_CHECKING( for --hash-style=both linker support )
18 + AC_MSG_CHECKING( for --hash-style=$WITH_LINKER_HASH_STYLE linker support )
19 hash_style_ldflags_save=$LDFLAGS
20 - LDFLAGS="$LDFLAGS -Wl,--hash-style=both"
21 + LDFLAGS="$LDFLAGS -Wl,--hash-style=$WITH_LINKER_HASH_STYLE"
22 AC_LINK_IFELSE([AC_LANG_PROGRAM([
23 #include <stdio.h>
24 ],[
25 @@ -1579,6 +1582,7 @@
26 LDFLAGS=$hash_style_ldflags_save
28 AC_SUBST(HAVE_LD_HASH_STYLE)
29 +AC_SUBST(WITH_LINKER_HASH_STYLE)
31 dnl ===================================================================
32 dnl Test the IRIX SGI Mips pro compiler
33 --- set_soenv.in
34 +++ set_soenv.in
35 @@ -1966,6 +1966,7 @@
36 ToFile( "HAVE_GCC_VISIBILITY_BROKEN",
37 "@HAVE_GCC_VISIBILITY_BROKEN@", "e" );
38 ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_HASH_STYLE@","e" );
39 +ToFile( "WITH_LINKER_HASH_STYLE","@WITH_LINKER_HASH_STYLE@","e" );
40 ToFile( "HAVE_LD_BSYMBOLIC_FUNCTIONS",
41 "@HAVE_LD_BSYMBOLIC_FUNCTIONS@","e" );
42 ToFile( "CXX", $CXX, "e" );
43 Index: unxlng.mk
44 ===================================================================
45 --- solenv/inc/unxlng.mk (Revision 276754)
46 +++ solenv/inc/unxlng.mk (Arbeitskopie)
47 @@ -202,7 +202,7 @@
48 STDSHLCUIMT+=-ltcmalloc
49 .ENDIF
50 .IF "$(HAVE_LD_HASH_STYLE)" == "TRUE"
51 -LINKFLAGS += -Wl,--hash-style=both
52 +LINKFLAGS += -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
53 .ELSE
54 LINKFLAGS += -Wl,-zdynsort
55 .ENDIF
56 --- stlport/makefile.mk
57 +++ stlport/makefile.mk
58 @@ -164,7 +164,7 @@
59 BUILD_FLAGS+= -j$(MAXPROCESS)
60 .ENDIF
61 .IF "$(HAVE_LD_HASH_STYLE)" == "TRUE"
62 -CXX+= -Wl,--hash-style=both
63 +CXX+= -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
64 .ENDIF
66 .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"