From 4f33af9a9d455c18dc0c475431c688be23f79279 Mon Sep 17 00:00:00 2001
From: mbr <mbr@FreeBSD.org>
Date: Sun, 2 Jun 2002 19:31:50 +0000
Subject: Do not link with lsupc++. With the newest gcc3.1 version it seems not
 to be necessary.

---
 .../files/patch-solenv+inc+unxfbsdi.mk             | 23 +++++++---------------
 1 file changed, 7 insertions(+), 16 deletions(-)

(limited to 'editors/openoffice.org-3-RC')

diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk
index 64c6e700ad1..82189ff426d 100644
--- a/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk
@@ -1,6 +1,6 @@
 --- ../solenv/inc/unxfbsdi.mk.orig	Wed Oct 24 19:21:47 2001
-+++ ../solenv/inc/unxfbsdi.mk	Wed May 29 14:32:50 2002
-@@ -1,84 +1,148 @@
++++ ../solenv/inc/unxfbsdi.mk	Sun Jun  2 11:20:10 2002
+@@ -1,84 +1,139 @@
 -
  # mak file fuer unxfbsdi
  
@@ -55,10 +55,6 @@
 +# Compiler flags for compiling static object in multi threaded
 +# environment with graphical user interface
 +CFLAGSOBJGUIMT=-fPIC
-+
-+# Compiler flags for compiling static object in multi threaded
-+# environment with character user interface
-+CFLAGSOBJCUIMT=-fPIC
  
 -cc=				gcc
 -CC=				g++
@@ -78,6 +74,10 @@
 -CFLAGSSLOCUIMT=	-fPIC
 -CFLAGSPROF=     -pg
 -CFLAGSDEBUG=	-g
++# Compiler flags for compiling static object in multi threaded
++# environment with character user interface
++CFLAGSOBJCUIMT=-fPIC
++
 +# Compiler flags for compiling shared object in multi threaded
 +# environment with graphical user interface
 +CFLAGSSLOGUIMT=-fPIC
@@ -166,15 +166,6 @@
 +# STLport always needs pthread.
 +LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(PTHREAD_LIBS)
 +LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS)
-+
-+.IF "$(CVER)"=="C300"
-+STDLIBGUIMT+= -lsupc++
-+STDLIBCUIMT+= -lsupc++
-+STDSHLGUIMT+= -lsupc++
-+STDSHLCUIMT+= -lsupc++
-+LIBSTLPORT+= -lsupc++
-+LIBSTLPORTST+= -lsupc++
-+.ENDIF
  
 +# default objectfilenames to lin
  STDOBJGUI=
@@ -198,7 +189,7 @@
  
  IMPLIB=
  IMPLIBFLAGS=
-@@ -87,12 +151,12 @@
+@@ -87,12 +142,12 @@
  MAPSYMFLAGS=
  
  RC=irc
-- 
cgit