diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-06-02 19:31:50 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-06-02 19:31:50 +0000 |
| commit | d76901000b85e26ddd664e3d8b413b0bef03a548 (patch) | |
| tree | 3d50d8b7a542d5a8a8562dffdeac5b7dc0a1dcba /editors/openoffice-1.0/files | |
| parent | Add a patch to not prototype getopt() again if gcc3 is used. (diff) | |
Do not link with lsupc++. With the newest gcc3.1 version it seems not to
be necessary.
Notes
Notes:
svn path=/head/; revision=60487
Diffstat (limited to 'editors/openoffice-1.0/files')
| -rw-r--r-- | editors/openoffice-1.0/files/patch-solenv+inc+unxfbsdi.mk | 23 | ||||
| -rw-r--r-- | editors/openoffice-1.0/files/patch-solenv::inc::unxfbsdi.mk | 23 |
2 files changed, 14 insertions, 32 deletions
diff --git a/editors/openoffice-1.0/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-1.0/files/patch-solenv+inc+unxfbsdi.mk index 64c6e700ad1d..82189ff426d2 100644 --- a/editors/openoffice-1.0/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice-1.0/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 diff --git a/editors/openoffice-1.0/files/patch-solenv::inc::unxfbsdi.mk b/editors/openoffice-1.0/files/patch-solenv::inc::unxfbsdi.mk index 64c6e700ad1d..82189ff426d2 100644 --- a/editors/openoffice-1.0/files/patch-solenv::inc::unxfbsdi.mk +++ b/editors/openoffice-1.0/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 |