summaryrefslogtreecommitdiff
path: root/editors/openoffice.org-2.0-devel/files/patch-i65513
diff options
context:
space:
mode:
Diffstat (limited to 'editors/openoffice.org-2.0-devel/files/patch-i65513')
-rw-r--r--editors/openoffice.org-2.0-devel/files/patch-i65513550
1 files changed, 277 insertions, 273 deletions
diff --git a/editors/openoffice.org-2.0-devel/files/patch-i65513 b/editors/openoffice.org-2.0-devel/files/patch-i65513
index ff0735045953..b8ddb89af6de 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-i65513
+++ b/editors/openoffice.org-2.0-devel/files/patch-i65513
@@ -1,6 +1,6 @@
---- config_office/set_soenv.in.orig Mon May 8 11:55:43 2006
-+++ config_office/set_soenv.in Mon May 22 17:39:23 2006
-@@ -320,32 +320,60 @@
+--- config_office/set_soenv.in 5 Jul 2006 22:32:39 -0000 1.107
++++ config_office/set_soenv.in 8 Jul 2006 03:12:23 -0000 1.105.6.2
+@@ -313,32 +313,60 @@ elsif ( $platform =~ m/netbsd/ )
$XPVERSION = "3";
}
elsif ( $platform =~ m/freebsd/ )
@@ -72,7 +72,7 @@
}
elsif ( $platform =~ m/linux-gnu/ )
{
-@@ -1294,6 +1322,7 @@
+@@ -1296,6 +1324,7 @@ if ($platform =~ m/linux-gnu/)
{
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd";
@@ -85,10 +85,11 @@ Index: solenv/inc/unx.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unx.mk,v
retrieving revision 1.32
-diff -u -r1.32 unx.mk
+retrieving revision 1.32.158.1
+diff -u -p -r1.32 -r1.32.158.1
--- solenv/inc/unx.mk 3 Feb 2006 17:33:26 -0000 1.32
-+++ solenv/inc/unx.mk 27 Jun 2006 01:52:09 -0000
-@@ -155,11 +155,10 @@
++++ solenv/inc/unx.mk 1 Jul 2006 06:02:12 -0000 1.32.158.1
+@@ -155,10 +155,9 @@
.INCLUDE : unxbsds.mk
.ENDIF
@@ -97,21 +98,264 @@ diff -u -r1.32 unx.mk
+.IF "$(COM)$(OS)" == "GCCFREEBSD"
+.INCLUDE : unxfbsd.mk
.ENDIF
-
-
+
.IF "$(COM)$(OS)$(CPU)" == "C730IRIXM"
.INCLUDE : unxirxm3.mk
- .ENDIF
-
-
+Index: solenv/inc/unxfbsd.mk
+===================================================================
+RCS file: solenv/inc/unxfbsd.mk
+diff -N solenv/inc/unxfbsd.mk
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ solenv/inc/unxfbsd.mk 8 Jul 2006 03:41:38 -0000 1.1.2.2
+@@ -0,0 +1,238 @@
++#*************************************************************************
++#
++# 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
++#
++#*************************************************************************
++
++# Makefile for FreeBSD.
++
++ASM=
++AFLAGS=
++
++SOLAR_JAVA*=
++JAVAFLAGSDEBUG=-g
++
++# Include arch specific makefile.
++.IF "$(CPUNAME)" == "INTEL"
++.INCLUDE : unxfbsdi.mk
++.ENDIF
++.IF "$(CPUNAME)" == "X86_64"
++.INCLUDE : unxfbsdx.mk
++.ENDIF
++
++# filter for supressing verbose messages from linker
++#not needed at the moment
++#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
++
++# _PTHREADS is needed for the stl
++CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
++
++# enable visibility define in "sal/types.h"
++.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
++.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++
++# this is a platform with JAVA support
++.IF "$(SOLAR_JAVA)"!=""
++JAVADEF=-DSOLAR_JAVA
++.IF "$(debug)"==""
++JAVA_RUNTIME=-ljava
++.ELSE
++JAVA_RUNTIME=-ljava_g
++.ENDIF
++.ENDIF
++
++# architecture dependent flags for the C and C++ compiler that can be changed by
++# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
++ARCH_FLAGS*=-mtune=pentiumpro
++
++# name of C++ Compiler
++CXX*=g++
++# name of C Compiler
++CC*=gcc
++.IF "$(SYSBASE)"!=""
++CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
++CXX+:=$(CFLAGS_SYSBASE)
++CC+:=$(CFLAGS_SYSBASE)
++.ENDIF # "$(SYSBASE)"!=""
++CFLAGS+=-fmessage-length=0 -c
++
++# flags to enable build with symbols; required for crashdump feature
++.IF "$(ENABLE_SYMBOLS)"=="SMALL"
++CFLAGSENABLESYMBOLS=-g1
++.ELSE
++CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
++
++.ENDIF
++
++# flags for the C++ Compiler
++CFLAGSCC= -pipe $(ARCH_FLAGS)
++# Flags for enabling exception handling
++CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
++# Flags for disabling exception handling
++CFLAGS_NO_EXCEPTIONS=-fno-exceptions
++
++# -fpermissive should be removed as soon as possible
++CFLAGSCXX= -pipe $(ARCH_FLAGS)
++PICSWITCH:=-fpic
++.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++CFLAGSCXX += -fvisibility-inlines-hidden
++.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++
++# Compiler flags for compiling static object in single threaded environment with graphical user interface
++CFLAGSOBJGUIST=
++# Compiler flags for compiling static object in single threaded environment with character user interface
++CFLAGSOBJCUIST=
++# Compiler flags for compiling static object in multi threaded environment with graphical user interface
++CFLAGSOBJGUIMT=
++# Compiler flags for compiling static object in multi threaded environment with character user interface
++CFLAGSOBJCUIMT=
++# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
++CFLAGSSLOGUIMT=$(PICSWITCH)
++# Compiler flags for compiling shared object in multi threaded environment with character user interface
++CFLAGSSLOCUIMT=$(PICSWITCH)
++# Compiler flags for profiling
++CFLAGSPROF=
++# Compiler flags for debugging
++CFLAGSDEBUG=-g
++CFLAGSDBGUTIL=
++# Compiler flags for enabling optimizations
++.IF "$(PRODUCT)"!=""
++CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products
++.ELSE # "$(PRODUCT)"!=""
++CFLAGSOPT= # no optimizing for non products
++.ENDIF # "$(PRODUCT)"!=""
++# Compiler flags for disabling optimizations
++CFLAGSNOOPT=-O0
++# Compiler flags for describing the output path
++CFLAGSOUTOBJ=-o
++
++# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
++CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
++CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
++ -Wno-non-virtual-dtor
++CFLAGSWALLCC=$(CFLAGSWARNCC)
++CFLAGSWALLCXX=$(CFLAGSWARNCXX)
++CFLAGSWERRCC=-Werror
++
++# Once all modules on this platform compile without warnings, set
++# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
++# settings.mk): Currently this is not tested on FreeBSD
++#MODULES_WITH_WARNINGS :=
++
++# switches for dynamic and static linking
++STATIC = -Wl,-Bstatic
++DYNAMIC = -Wl,-Bdynamic
++
++# name of linker
++LINK*=$(CXX)
++LINKC*=$(CC)
++
++# default linker flags
++LINKFLAGSDEFS*=#-Wl,-z,defs
++LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
++LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
++
++# linker flags for linking applications
++LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++
++# linker flags for linking shared libraries
++LINKFLAGSSHLGUI= -shared
++LINKFLAGSSHLCUI= -shared
++
++LINKFLAGSTACK=
++LINKFLAGSPROF=
++LINKFLAGSDEBUG=-g
++LINKFLAGSOPT=
++
++# linker flags for optimization (symbol hashtable)
++# for now, applied to symbol scoped libraries, only
++LINKFLAGSOPTIMIZE*=-Wl,-O1
++LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
++
++SONAME_SWITCH=-Wl,-h
++
++# Sequence of libs does matter !
++
++STDLIBCPP=-lstdc++
++
++# default objectfilenames to link
++STDOBJVCL=$(L)$/salmain.o
++STDOBJGUI=
++STDSLOGUI=
++STDOBJCUI=
++STDSLOCUI=
++
++# libraries for linking applications
++STDLIBCUIST=-lm
++STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
++STDLIBCUIMT=$(PTHREAD_LIBS) -lm
++STDLIBGUIST=-lX11 -lm
++# libraries for linking shared libraries
++STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
++STDSHLCUIMT=$(PTHREAD_LIBS) -lm
++STDSHLGUIST=-lX11 -lXext -lm
++STDSHLCUIST=-lm
++
++LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
++
++.IF "$(USE_STLP_DEBUG)" != ""
++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
++LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
++.ELSE # "$(USE_STLP_DEBUG)" != ""
++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
++LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
++.ENDIF # "$(USE_STLP_DEBUG)" != ""
++
++#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
++
++# name of library manager
++LIBMGR=ar
++LIBFLAGS=-r
++
++# tool for generating import libraries
++IMPLIB=
++IMPLIBFLAGS=
++
++MAPSYM=
++MAPSYMFLAGS=
++
++RC=irc
++RCFLAGS=-fo$@ $(RCFILES)
++RCLINK=
++RCLINKFLAGS=
++RCSETVERSION=
++
++# platform specific identifier for shared libs
++DLLPRE=lib
++DLLPOST=.so
Index: solenv/inc/unxfbsdi.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
-retrieving revision 1.21
-diff -u -r1.21 unxfbsdi.mk
---- solenv/inc/unxfbsdi.mk 19 Jun 2006 17:13:50 -0000 1.21
-+++ solenv/inc/unxfbsdi.mk 27 Jun 2006 01:52:35 -0000
-@@ -33,196 +33,23 @@
+retrieving revision 1.22
+retrieving revision 1.21.16.3
+diff -u -p -r1.22 -r1.21.16.3
+--- solenv/inc/unxfbsdi.mk 5 Jul 2006 22:01:09 -0000 1.22
++++ solenv/inc/unxfbsdi.mk 8 Jul 2006 04:06:30 -0000 1.21.16.3
+@@ -33,196 +33,15 @@
#
#*************************************************************************
@@ -146,12 +390,11 @@ diff -u -r1.21 unxfbsdi.mk
+#
+# FreBSD/i386 specific defines
+#
-+
++
+CDEFS+=-DX86
# architecture dependent flags for the C and C++ compiler that can be changed by
# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-+
ARCH_FLAGS*=-mtune=pentiumpro
-# name of C++ Compiler
@@ -163,7 +406,7 @@ diff -u -r1.21 unxfbsdi.mk
-CXX+:=$(CFLAGS_SYSBASE)
-CC+:=$(CFLAGS_SYSBASE)
-.ENDIF # "$(SYSBASE)"!=""
--CFLAGS+=-fmessage-length=0 -c $(INCLUDE)
+-CFLAGS+=-fmessage-length=0 -c
-
-# flags to enable build with symbols; required for crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
@@ -204,12 +447,12 @@ diff -u -r1.21 unxfbsdi.mk
-# Compiler flags for debugging
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
- # Compiler flags for enabling optimizations
- .IF "$(PRODUCT)"!=""
- CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products
- .ELSE # "$(PRODUCT)"!=""
- CFLAGSOPT= # no optimizing for non products
- .ENDIF # "$(PRODUCT)"!=""
+-# Compiler flags for enabling optimizations
+-.IF "$(PRODUCT)"!=""
+-CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products
+-.ELSE # "$(PRODUCT)"!=""
+-CFLAGSOPT= # no optimizing for non products
+-.ENDIF # "$(PRODUCT)"!=""
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
@@ -308,15 +551,18 @@ diff -u -r1.21 unxfbsdi.mk
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
--# platform specific identifier for shared libs
+-
+ # platform specific identifier for shared libs
DLLPOSTFIX=fi
-DLLPRE=lib
-DLLPOST=.so
-
-
---- /dev/null Wed Jun 28 21:44:00 2006
-+++ solenv/inc/unxfbsdx.mk Wed Jun 28 21:38:06 2006
+-
+Index: solenv/inc/unxfbsdx.mk
+===================================================================
+RCS file: solenv/inc/unxfbsdx.mk
+diff -N solenv/inc/unxfbsdx.mk
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ solenv/inc/unxfbsdx.mk 1 Jul 2006 06:04:01 -0000 1.1.2.1
@@ -0,0 +1,56 @@
+#*************************************************************************
+#
@@ -374,245 +620,3 @@ diff -u -r1.21 unxfbsdi.mk
+
+# platform specific identifier for shared libs
+DLLPOSTFIX=fx
-
---- /dev/null Wed Jun 28 21:44:00 2006
-+++ solenv/inc/unxfbsd.mk Wed Jun 28 21:50:16 2006
-@@ -0,0 +1,238 @@
-+#*************************************************************************
-+#
-+# 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
-+#
-+#*************************************************************************
-+
-+# Makefile for FreeBSD.
-+
-+ASM=
-+AFLAGS=
-+
-+SOLAR_JAVA*=
-+JAVAFLAGSDEBUG=-g
-+
-+# Include arch specific makefile.
-+.IF "$(CPUNAME)" == "INTEL"
-+.INCLUDE : unxfbsdi.mk
-+.ENDIF
-+.IF "$(CPUNAME)" == "X86_64"
-+.INCLUDE : unxfbsdx.mk
-+.ENDIF
-+
-+# filter for supressing verbose messages from linker
-+#not needed at the moment
-+#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
-+
-+# _PTHREADS is needed for the stl
-+CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
-+
-+# enable visibility define in "sal/types.h"
-+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
-+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+
-+# this is a platform with JAVA support
-+.IF "$(SOLAR_JAVA)"!=""
-+JAVADEF=-DSOLAR_JAVA
-+.IF "$(debug)"==""
-+JAVA_RUNTIME=-ljava
-+.ELSE
-+JAVA_RUNTIME=-ljava_g
-+.ENDIF
-+.ENDIF
-+
-+# architecture dependent flags for the C and C++ compiler that can be changed by
-+# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-+ARCH_FLAGS*=-mtune=pentiumpro
-+
-+# name of C++ Compiler
-+CXX*=g++
-+# name of C Compiler
-+CC*=gcc
-+.IF "$(SYSBASE)"!=""
-+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
-+CXX+:=$(CFLAGS_SYSBASE)
-+CC+:=$(CFLAGS_SYSBASE)
-+.ENDIF # "$(SYSBASE)"!=""
-+CFLAGS+=-fmessage-length=0 -c $(INCLUDE)
-+
-+# flags to enable build with symbols; required for crashdump feature
-+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-+CFLAGSENABLESYMBOLS=-g1
-+.ELSE
-+CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-+
-+.ENDIF
-+
-+# flags for the C++ Compiler
-+CFLAGSCC= -pipe $(ARCH_FLAGS)
-+# Flags for enabling exception handling
-+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
-+# Flags for disabling exception handling
-+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-+
-+# -fpermissive should be removed as soon as possible
-+CFLAGSCXX= -pipe $(ARCH_FLAGS)
-+PICSWITCH:=-fpic
-+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+CFLAGSCXX += -fvisibility-inlines-hidden
-+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+
-+# Compiler flags for compiling static object in single threaded environment with graphical user interface
-+CFLAGSOBJGUIST=
-+# Compiler flags for compiling static object in single threaded environment with character user interface
-+CFLAGSOBJCUIST=
-+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-+CFLAGSOBJGUIMT=
-+# Compiler flags for compiling static object in multi threaded environment with character user interface
-+CFLAGSOBJCUIMT=
-+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-+CFLAGSSLOGUIMT=$(PICSWITCH)
-+# Compiler flags for compiling shared object in multi threaded environment with character user interface
-+CFLAGSSLOCUIMT=$(PICSWITCH)
-+# Compiler flags for profiling
-+CFLAGSPROF=
-+# Compiler flags for debugging
-+CFLAGSDEBUG=-g
-+CFLAGSDBGUTIL=
-+# Compiler flags for enabling optimizations
-+.IF "$(PRODUCT)"!=""
-+CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products
-+.ELSE # "$(PRODUCT)"!=""
-+CFLAGSOPT= # no optimizing for non products
-+.ENDIF # "$(PRODUCT)"!=""
-+# Compiler flags for disabling optimizations
-+CFLAGSNOOPT=-O0
-+# Compiler flags for describing the output path
-+CFLAGSOUTOBJ=-o
-+
-+# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-+CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
-+CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
-+ -Wno-non-virtual-dtor
-+CFLAGSWALLCC=$(CFLAGSWARNCC)
-+CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-+CFLAGSWERRCC=-Werror
-+
-+# Once all modules on this platform compile without warnings, set
-+# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
-+# settings.mk): Currently this is not tested on FreeBSD
-+#MODULES_WITH_WARNINGS :=
-+
-+# switches for dynamic and static linking
-+STATIC = -Wl,-Bstatic
-+DYNAMIC = -Wl,-Bdynamic
-+
-+# name of linker
-+LINK*=$(CXX)
-+LINKC*=$(CC)
-+
-+# default linker flags
-+LINKFLAGSDEFS*=#-Wl,-z,defs
-+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
-+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
-+
-+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+
-+# linker flags for linking shared libraries
-+LINKFLAGSSHLGUI= -shared
-+LINKFLAGSSHLCUI= -shared
-+
-+LINKFLAGSTACK=
-+LINKFLAGSPROF=
-+LINKFLAGSDEBUG=-g
-+LINKFLAGSOPT=
-+
-+# linker flags for optimization (symbol hashtable)
-+# for now, applied to symbol scoped libraries, only
-+LINKFLAGSOPTIMIZE*=-Wl,-O1
-+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-+
-+SONAME_SWITCH=-Wl,-h
-+
-+# Sequence of libs does matter !
-+
-+STDLIBCPP=-lstdc++
-+
-+# default objectfilenames to link
-+STDOBJVCL=$(L)$/salmain.o
-+STDOBJGUI=
-+STDSLOGUI=
-+STDOBJCUI=
-+STDSLOCUI=
-+
-+# libraries for linking applications
-+STDLIBCUIST=-lm
-+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
-+STDLIBCUIMT=$(PTHREAD_LIBS) -lm
-+STDLIBGUIST=-lX11 -lm
-+# libraries for linking shared libraries
-+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
-+STDSHLCUIMT=$(PTHREAD_LIBS) -lm
-+STDSHLGUIST=-lX11 -lXext -lm
-+STDSHLCUIST=-lm
-+
-+LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-+
-+.IF "$(USE_STLP_DEBUG)" != ""
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
-+.ELSE # "$(USE_STLP_DEBUG)" != ""
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-+.ENDIF # "$(USE_STLP_DEBUG)" != ""
-+
-+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
-+
-+# name of library manager
-+LIBMGR=ar
-+LIBFLAGS=-r
-+
-+# tool for generating import libraries
-+IMPLIB=
-+IMPLIBFLAGS=
-+
-+MAPSYM=
-+MAPSYMFLAGS=
-+
-+RC=irc
-+RCFLAGS=-fo$@ $(RCFILES)
-+RCLINK=
-+RCLINKFLAGS=
-+RCSETVERSION=
-+
-+# platform specific identifier for shared libs
-+DLLPRE=lib
-+DLLPOST=.so