From 0831655ef99067a0b88ffbd12c38ea160561875b Mon Sep 17 00:00:00 2001 From: Martin Blapp Date: Sat, 9 Mar 2002 19:57:47 +0000 Subject: Add ASM flags, replace the REENTRANT and THREAD_SAFE definitions with -pthread, add JAVA_RUNTIME definition, change the optimization from 02 to -O and from -O to -O0. Add -lXaw -lXt to link for GUI part, and reorder the librarys the correct way. --- .../openoffice/files/patch-solenv+inc+unxfbsdi.mk | 210 +++++++++++++++++++-- .../files/patch-solenv::inc::unxfbsdi.mk | 210 +++++++++++++++++++-- 2 files changed, 398 insertions(+), 22 deletions(-) (limited to 'editors/openoffice/files') diff --git a/editors/openoffice/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice/files/patch-solenv+inc+unxfbsdi.mk index 3a5e0498eeaf..52aee7ac8b51 100644 --- a/editors/openoffice/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice/files/patch-solenv+inc+unxfbsdi.mk @@ -1,20 +1,139 @@ ---- ../solenv/inc/unxfbsdi.mk.orig Sat Mar 9 01:11:29 2002 -+++ ../solenv/inc/unxfbsdi.mk Sat Mar 9 01:08:23 2002 -@@ -13,7 +13,7 @@ - cc= gcc - CC= g++ - CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 +--- ../solenv/inc/unxfbsdi.mk.orig Wed Oct 24 19:21:47 2001 ++++ ../solenv/inc/unxfbsdi.mk Sat Mar 9 20:46:20 2002 +@@ -1,84 +1,146 @@ +- + # mak file fuer unxfbsdi + +-ASM= +-AFLAGS= ++ASM=gcc ++AFLAGS=-x assembler-with-cpp -c $(CDEFS) + + SOLAR_JAVA=TRUE + JAVAFLAGSDEBUG=-g + ++# filter for supressing verbose messages from linker ++# not needed at the moment + LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" + ++# name of C Compiler ++cc=gcc ++ ++# name of C++ Compiler ++CC=g++ ++ ++# options for C and C++ Compiler ++CDEFS+=-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -DOSVERSION=$(OSVERSION) ++CDEFS+=-pthread ++ ++# 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 ++ ++# flags for C and C++ Compiler ++CFLAGS+=-g -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include ++CFLAGS+=-I/usr/X11R6/include ++ ++# flags for the C++ Compiler ++CFLAGSCC=-pipe -g ++CFLAGSCXX=-pipe -fno-for-scope -fpermissive ++ ++# Flags for enabling exception handling ++CFLAGSEXCEPTIONS=-fexceptions ++ ++# Flags for disabling exception handling ++CFLAGS_NO_EXCEPTIONS=-fno-exceptions ++ ++# Compiler flags for compiling static object in single threaded ++# environment with graphical user interface ++CFLAGSOBJGUIST=-fPIC ++ ++# Compiler flags for compiling static object in single threaded ++# environment with character user interface ++CFLAGSOBJCUIST=-fPIC ++ ++# 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 ++ ++# Compiler flags for compiling shared object in multi threaded ++# environment with graphical user interface ++CFLAGSSLOGUIMT=-fPIC + +-cc= gcc +-CC= g++ +-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE -+CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE -DOSVERSION=$(OSVERSION) - CFLAGS+= -w -c $(INCLUDE) - CFLAGS+= -I/usr/X11R6/include - CFLAGSCC= -pipe -@@ -42,12 +42,12 @@ +-CFLAGS+= -w -c $(INCLUDE) +-CFLAGS+= -I/usr/X11R6/include +-CFLAGSCC= -pipe +-CFLAGSCXX= -pipe -fno-for-scope -fpermissive +-CFLAGSEXCEPTIONS= -fexceptions +-CFLAGS_NO_EXCEPTIONS= -fno-exceptions +-CFLAGSOBJGUIST= -fPIC +-CFLAGSOBJCUIST= -fPIC +-CFLAGSOBJGUIMT= -fPIC +-CFLAGSOBJCUIMT= -fPIC +-CFLAGSSLOGUIMT= -fPIC +-CFLAGSSLOCUIMT= -fPIC +-CFLAGSPROF= -pg +-CFLAGSDEBUG= -g ++# Compiler flags for compiling shared object in multi threaded ++# environment with character user interface ++CFLAGSSLOCUIMT=-fPIC ++ ++# Compiler flags for profiling ++CFLAGSPROF=-pg ++ ++# Compiler flags for debugging ++CFLAGSDEBUG=-g + CFLAGSDBGUTIL= +-CFLAGSOPT= -O2 +-CFLAGSNOOPT= -O +-CFLAGSOUTOBJ= -o +- +-STATIC= -Wl,-Bstatic +-DYNAMIC= -Wl,-Bdynamic +- +-#THREADLIB= -pthread +-LINK= gcc +-# -v -nostdlib ++ ++# Compiler flags to enable optimizations ++# -02 is broken for FreeBSD ++CFLAGSOPT=-O ++ ++# Compiler flags to disable optimizations ++# -0 is broken for STLport ++CFLAGSNOOPT=-O0 ++ ++# Compiler flags for the output path ++CFLAGSOUTOBJ=-o ++ ++# switches for dynamic and static linking ++STATIC=-Wl,-Bstatic ++DYNAMIC=-Wl,-Bdynamic ++ ++LINK=gcc LINKFLAGS= ++ ++# linker flags for linking applications LINKFLAGSAPPGUI= -Wl,-export-dynamic LINKFLAGSAPPCUI= -Wl,-export-dynamic -LINKFLAGSSHLGUI= -shared -LINKFLAGSSHLCUI= -shared ++ ++# linker flags for linking shared libraries +LINKFLAGSSHLGUI= -shared -Wl,-export-dynamic +LINKFLAGSSHLCUI= -shared -Wl,-export-dynamic LINKFLAGSTACK= @@ -25,3 +144,72 @@ .IF "$(NO_BSYMBOLIC)"=="" .IF "$(PRJNAME)" != "envtest" +-LINKFLAGSSHLGUI+= -Wl,-Bsymbolic +-LINKFLAGSSHLCUI+= -Wl,-Bsymbolic ++LINKFLAGSSHLGUI+=-Wl,-Bsymbolic ++LINKFLAGSSHLCUI+=-Wl,-Bsymbolic + .ENDIF + .ENDIF + + LINKVERSIONMAPFLAG=-Wl,--version-script + ++# Sequence of libs does matter ! + STDLIBCPP=-lstdc++ + +-# _SYSLIBS= -L/usr/lib -lm +-# _X11LIBS= -L/usr/X11R6/lib -lXext -lX11 +-# _CXXLIBS= -L/usr/lib -lstdc++ -L/usr/local/lib ++# libraries for linking applications ++STDLIBCUIST=-lm ++STDLIBGUIST=-lXaw -lXt -lX11 -lm ++STDLIBGUIMT=-lXaw -lXt -lX11 -pthread -lm -lstlport_gcc ++STDLIBCUIMT=-pthread -lm -lstlport_gcc ++ ++# libraries for linking shared libraries ++STDSHLGUIMT=-lXaw -lXt -lX11 -lXext -pthread -lm -lstlport_gcc ++STDSHLCUIMT=-pthread -lm -lstlport_gcc ++ ++# STLport always needs pthread. ++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -pthread ++LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -pthread + ++# default objectfilenames to lin + STDOBJGUI= + STDSLOGUI= + STDOBJCUI= + STDSLOCUI= + +-STDLIBCUIST=-lm +-STDLIBGUIST=-lX11 -lm +-STDLIBGUIMT=-lX11 -lXext -pthread -lm -lstlport_gcc +-STDLIBCUIMT=-pthread -lm -lstlport_gcc +-STDSHLGUIMT=-lX11 -lXext -pthread -lm -lstlport_gcc +-STDSHLCUIMT=-pthread -lm -lstlport_gcc + +-LIBMGR= ar +-LIBFLAGS= -r +-LIBEXT= .a ++LIBMGR=ar ++LIBFLAGS=-r ++LIBEXT=.a + + IMPLIB= + IMPLIBFLAGS= +@@ -87,12 +149,12 @@ + MAPSYMFLAGS= + + RC=irc +-RCFLAGS= -fo$@ $(RCFILES) ++RCFLAGS=-fo$@ $(RCFILES) + RCLINK= + RCLINKFLAGS= + RCSETVERSION= + +-DLLPOSTFIX= fi +-DLLPRE= lib +-DLLPOST= .so +-LDUMP= ++# platform specific identifier for shared libs ++DLLPOSTFIX=fi ++DLLPRE=lib ++DLLPOST=.so diff --git a/editors/openoffice/files/patch-solenv::inc::unxfbsdi.mk b/editors/openoffice/files/patch-solenv::inc::unxfbsdi.mk index 3a5e0498eeaf..52aee7ac8b51 100644 --- a/editors/openoffice/files/patch-solenv::inc::unxfbsdi.mk +++ b/editors/openoffice/files/patch-solenv::inc::unxfbsdi.mk @@ -1,20 +1,139 @@ ---- ../solenv/inc/unxfbsdi.mk.orig Sat Mar 9 01:11:29 2002 -+++ ../solenv/inc/unxfbsdi.mk Sat Mar 9 01:08:23 2002 -@@ -13,7 +13,7 @@ - cc= gcc - CC= g++ - CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 +--- ../solenv/inc/unxfbsdi.mk.orig Wed Oct 24 19:21:47 2001 ++++ ../solenv/inc/unxfbsdi.mk Sat Mar 9 20:46:20 2002 +@@ -1,84 +1,146 @@ +- + # mak file fuer unxfbsdi + +-ASM= +-AFLAGS= ++ASM=gcc ++AFLAGS=-x assembler-with-cpp -c $(CDEFS) + + SOLAR_JAVA=TRUE + JAVAFLAGSDEBUG=-g + ++# filter for supressing verbose messages from linker ++# not needed at the moment + LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" + ++# name of C Compiler ++cc=gcc ++ ++# name of C++ Compiler ++CC=g++ ++ ++# options for C and C++ Compiler ++CDEFS+=-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -DOSVERSION=$(OSVERSION) ++CDEFS+=-pthread ++ ++# 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 ++ ++# flags for C and C++ Compiler ++CFLAGS+=-g -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include ++CFLAGS+=-I/usr/X11R6/include ++ ++# flags for the C++ Compiler ++CFLAGSCC=-pipe -g ++CFLAGSCXX=-pipe -fno-for-scope -fpermissive ++ ++# Flags for enabling exception handling ++CFLAGSEXCEPTIONS=-fexceptions ++ ++# Flags for disabling exception handling ++CFLAGS_NO_EXCEPTIONS=-fno-exceptions ++ ++# Compiler flags for compiling static object in single threaded ++# environment with graphical user interface ++CFLAGSOBJGUIST=-fPIC ++ ++# Compiler flags for compiling static object in single threaded ++# environment with character user interface ++CFLAGSOBJCUIST=-fPIC ++ ++# 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 ++ ++# Compiler flags for compiling shared object in multi threaded ++# environment with graphical user interface ++CFLAGSSLOGUIMT=-fPIC + +-cc= gcc +-CC= g++ +-CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE -+CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE -DOSVERSION=$(OSVERSION) - CFLAGS+= -w -c $(INCLUDE) - CFLAGS+= -I/usr/X11R6/include - CFLAGSCC= -pipe -@@ -42,12 +42,12 @@ +-CFLAGS+= -w -c $(INCLUDE) +-CFLAGS+= -I/usr/X11R6/include +-CFLAGSCC= -pipe +-CFLAGSCXX= -pipe -fno-for-scope -fpermissive +-CFLAGSEXCEPTIONS= -fexceptions +-CFLAGS_NO_EXCEPTIONS= -fno-exceptions +-CFLAGSOBJGUIST= -fPIC +-CFLAGSOBJCUIST= -fPIC +-CFLAGSOBJGUIMT= -fPIC +-CFLAGSOBJCUIMT= -fPIC +-CFLAGSSLOGUIMT= -fPIC +-CFLAGSSLOCUIMT= -fPIC +-CFLAGSPROF= -pg +-CFLAGSDEBUG= -g ++# Compiler flags for compiling shared object in multi threaded ++# environment with character user interface ++CFLAGSSLOCUIMT=-fPIC ++ ++# Compiler flags for profiling ++CFLAGSPROF=-pg ++ ++# Compiler flags for debugging ++CFLAGSDEBUG=-g + CFLAGSDBGUTIL= +-CFLAGSOPT= -O2 +-CFLAGSNOOPT= -O +-CFLAGSOUTOBJ= -o +- +-STATIC= -Wl,-Bstatic +-DYNAMIC= -Wl,-Bdynamic +- +-#THREADLIB= -pthread +-LINK= gcc +-# -v -nostdlib ++ ++# Compiler flags to enable optimizations ++# -02 is broken for FreeBSD ++CFLAGSOPT=-O ++ ++# Compiler flags to disable optimizations ++# -0 is broken for STLport ++CFLAGSNOOPT=-O0 ++ ++# Compiler flags for the output path ++CFLAGSOUTOBJ=-o ++ ++# switches for dynamic and static linking ++STATIC=-Wl,-Bstatic ++DYNAMIC=-Wl,-Bdynamic ++ ++LINK=gcc LINKFLAGS= ++ ++# linker flags for linking applications LINKFLAGSAPPGUI= -Wl,-export-dynamic LINKFLAGSAPPCUI= -Wl,-export-dynamic -LINKFLAGSSHLGUI= -shared -LINKFLAGSSHLCUI= -shared ++ ++# linker flags for linking shared libraries +LINKFLAGSSHLGUI= -shared -Wl,-export-dynamic +LINKFLAGSSHLCUI= -shared -Wl,-export-dynamic LINKFLAGSTACK= @@ -25,3 +144,72 @@ .IF "$(NO_BSYMBOLIC)"=="" .IF "$(PRJNAME)" != "envtest" +-LINKFLAGSSHLGUI+= -Wl,-Bsymbolic +-LINKFLAGSSHLCUI+= -Wl,-Bsymbolic ++LINKFLAGSSHLGUI+=-Wl,-Bsymbolic ++LINKFLAGSSHLCUI+=-Wl,-Bsymbolic + .ENDIF + .ENDIF + + LINKVERSIONMAPFLAG=-Wl,--version-script + ++# Sequence of libs does matter ! + STDLIBCPP=-lstdc++ + +-# _SYSLIBS= -L/usr/lib -lm +-# _X11LIBS= -L/usr/X11R6/lib -lXext -lX11 +-# _CXXLIBS= -L/usr/lib -lstdc++ -L/usr/local/lib ++# libraries for linking applications ++STDLIBCUIST=-lm ++STDLIBGUIST=-lXaw -lXt -lX11 -lm ++STDLIBGUIMT=-lXaw -lXt -lX11 -pthread -lm -lstlport_gcc ++STDLIBCUIMT=-pthread -lm -lstlport_gcc ++ ++# libraries for linking shared libraries ++STDSHLGUIMT=-lXaw -lXt -lX11 -lXext -pthread -lm -lstlport_gcc ++STDSHLCUIMT=-pthread -lm -lstlport_gcc ++ ++# STLport always needs pthread. ++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -pthread ++LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -pthread + ++# default objectfilenames to lin + STDOBJGUI= + STDSLOGUI= + STDOBJCUI= + STDSLOCUI= + +-STDLIBCUIST=-lm +-STDLIBGUIST=-lX11 -lm +-STDLIBGUIMT=-lX11 -lXext -pthread -lm -lstlport_gcc +-STDLIBCUIMT=-pthread -lm -lstlport_gcc +-STDSHLGUIMT=-lX11 -lXext -pthread -lm -lstlport_gcc +-STDSHLCUIMT=-pthread -lm -lstlport_gcc + +-LIBMGR= ar +-LIBFLAGS= -r +-LIBEXT= .a ++LIBMGR=ar ++LIBFLAGS=-r ++LIBEXT=.a + + IMPLIB= + IMPLIBFLAGS= +@@ -87,12 +149,12 @@ + MAPSYMFLAGS= + + RC=irc +-RCFLAGS= -fo$@ $(RCFILES) ++RCFLAGS=-fo$@ $(RCFILES) + RCLINK= + RCLINKFLAGS= + RCSETVERSION= + +-DLLPOSTFIX= fi +-DLLPRE= lib +-DLLPOST= .so +-LDUMP= ++# platform specific identifier for shared libs ++DLLPOSTFIX=fi ++DLLPRE=lib ++DLLPOST=.so -- cgit v1.2.3