From 22a77d8a58b61517b1b1a296483f03e1b3df0094 Mon Sep 17 00:00:00 2001 From: Martin Blapp Date: Sat, 9 Mar 2002 00:18:08 +0000 Subject: Add -DOSVERSION to FreeBSD build. Remove the netbsd unxbsdi.mk file. --- editors/openoffice-1.1/files/patch-set_soenv.1 | 20 ++- .../files/patch-solenv+inc+unxfbsdi.mk | 13 +- .../files/patch-solenv::inc::unxbsdi.mk | 189 --------------------- .../files/patch-solenv::inc::unxfbsdi.mk | 13 +- 4 files changed, 37 insertions(+), 198 deletions(-) delete mode 100644 editors/openoffice-1.1/files/patch-solenv::inc::unxbsdi.mk (limited to 'editors/openoffice-1.1/files') diff --git a/editors/openoffice-1.1/files/patch-set_soenv.1 b/editors/openoffice-1.1/files/patch-set_soenv.1 index 1e86e46d31ae..be73d3047dcf 100644 --- a/editors/openoffice-1.1/files/patch-set_soenv.1 +++ b/editors/openoffice-1.1/files/patch-set_soenv.1 @@ -1,5 +1,5 @@ --- set_soenv.1.orig Tue Nov 20 18:26:33 2001 -+++ set_soenv.1 Fri Mar 8 22:33:35 2002 ++++ set_soenv.1 Sat Mar 9 00:32:14 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of @@ -35,7 +35,17 @@ } elsif ( $platform eq "$Linux" ) { -@@ -954,7 +955,7 @@ +@@ -857,7 +858,8 @@ + $D.$OS. + $D.$CPUNAME; + if ($platform eq "$FreeBSD") +-{ $SOLARDEF .= $D."X86"; ++{ $SOLARDEF .= $D."X86". ++ $D."OSVERSION=$OSVERSION"; + } + $SOLARDEF .= $D."_REENTRANT". + $D."_POSIX_PTHREAD_SEMANTICS"; +@@ -954,7 +956,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -44,7 +54,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -968,6 +969,22 @@ +@@ -968,6 +970,22 @@ $ps.$USR.$BIN.$ds."X11". $ps.$USR.$LIB; } @@ -67,7 +77,7 @@ elsif ($platform eq "$Winnt") { $COMPATH_ROOT = $COMPATH; $COMPATH_ROOT =~ s/\/vc98$//; -@@ -1067,25 +1084,19 @@ +@@ -1067,25 +1085,19 @@ { $SOLARINC .= $I.$USR.$INCLUDE. $STLPORT_stlport; @@ -97,7 +107,7 @@ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31". $I.'$JAVA_HOME'.$INCLUDE; -@@ -1273,6 +1284,7 @@ +@@ -1273,6 +1285,7 @@ ToFile( "GUIENV", $GUIENV, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); diff --git a/editors/openoffice-1.1/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-1.1/files/patch-solenv+inc+unxfbsdi.mk index d1b8dadca9f4..3a5e0498eeaf 100644 --- a/editors/openoffice-1.1/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice-1.1/files/patch-solenv+inc+unxfbsdi.mk @@ -1,5 +1,14 @@ ---- ../solenv/inc/unxfbsdi.mk 2001/10/24 17:21:47 1.4 -+++ ../solenv/inc/unxfbsdi.mk 2002/03/03 19:39:21 +--- ../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 +-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 @@ LINKFLAGS= LINKFLAGSAPPGUI= -Wl,-export-dynamic diff --git a/editors/openoffice-1.1/files/patch-solenv::inc::unxbsdi.mk b/editors/openoffice-1.1/files/patch-solenv::inc::unxbsdi.mk deleted file mode 100644 index 2896c1cfda02..000000000000 --- a/editors/openoffice-1.1/files/patch-solenv::inc::unxbsdi.mk +++ /dev/null @@ -1,189 +0,0 @@ ---- ../solenv/inc/unxbsdi.mk.orig Wed Oct 24 19:21:47 2001 -+++ ../solenv/inc/unxbsdi.mk Tue Mar 5 13:50:24 2002 -@@ -1,77 +1,119 @@ - # mak file fuer unxbsdi -+ASM=gcc -+AFLAGS=-x assembler-with-cpp -c $(CDEFS) - --ASM= --AFLAGS= -+SOLAR_JAVA=TRUE -+JAVAFLAGSDEBUG=-g - --cc=gcc -c --CC=g++ -c --CDEFS+=-D_PTHREADS -D_REENTRANT --CDEFS+=-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE --CDEFS+=-DNO_INET_ON_DEMAND -DX86 -DNEW_SOLAR -DNCIfeature --CFLAGS+=-w -c $(INCLUDE) --CFLAGSCC=-pipe -mpentium -+# 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+=-D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 -D -+ -+# 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 -+ -+# name of C++ Compiler -+CC=g++ -+# name of C Compiler -+cc=gcc -+# flags for C and C++ Compiler -+CFLAGS=-w -c $(INCLUDE) -I$(SOLARENV)/unxbsdi/usr/include -+# flags for the C++ Compiler -+CFLAGSCC= -pipe -+# Flags for enabling exception handling - CFLAGSEXCEPTIONS=-fexceptions -+# Flags for disabling exception handling - CFLAGS_NO_EXCEPTIONS=-fno-exceptions --CFLAGSCXX=-pipe -mpentium -fguiding-decls -frtti - --CFLAGSOBJGUIST= --CFLAGSOBJCUIST= --CFLAGSOBJGUIMT= --CFLAGSOBJCUIMT= --CFLAGSSLOGUIMT= -fPIC -+# 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 -+# Compiler flags for compiling shared object in multi threaded environment with character user interface - CFLAGSSLOCUIMT= -fPIC --CFLAGSPROF= -pg --CFLAGSDEBUG= -g - CFLAGSDBGUTIL= --# die zusaetzlichen Optimierungsschalter schalten alle Optimierungen ein, die zwischen -O und -O2 liegen und --# per Schalter einschaltbar sind. Dennoch gibt es einen Unterschied: einige Files im Writer werden --# misoptimiert wenn -O2 eingeschaltet ist und waehrend die untenstehenden Schalter funktionieren. --CFLAGSOPT=-O -fcse-follow-jumps -fcse-skip-blocks -fexpensive-optimizations -fstrength-reduce -fforce-mem -fcaller-saves -fgcse -frerun-cse-after-loop -frerun-loop-opt -fschedule-insns2 -fregmove -foptimize-register-move --#CFLAGSOPT=-O2 -+# Compiler flags for profiling -+CFLAGSPROF= -+# Compiler flags for debugging -+CFLAGSDEBUG=-g -+# Compiler flags for enabling optimazations -+CFLAGSOPT=-O2 -+# Compiler flags for disabling optimazations - CFLAGSNOOPT=-O -+# Compiler flags for discibing the output path - CFLAGSOUTOBJ=-o - -+# switches for dynamic and static linking - STATIC= -Bstatic - DYNAMIC= -Bdynamic - --THREADLIB= --LINK= gcc -+# name of linker -+LINK=gcc -+ -+# default linker flags - LINKFLAGS= --.IF "$(PRJNAME)"=="osl" || "$(PRJNAME)"=="rtl" --LINKFLAGSSHLGUI= -shared -nostdlib --LINKFLAGSSHLCUI= -shared -nostdlib --.ELSE --LINKFLAGSSHLGUI= -shared -nostdlib /usr/lib/c++rt0.o --LINKFLAGSSHLCUI= -shared -nostdlib /usr/lib/c++rt0.o --.ENDIF --LINKFLAGSAPPGUI= -L/nw386/dev/s/solenv/unxbsdi/lib -lpthread_init -lpthread --LINKFLAGSAPPCUI= -L/nw386/dev/s/solenv/unxbsdi/lib -lpthread_init -lpthread - LINKFLAGSTACK= - LINKFLAGSPROF= --LINKFLAGSDEBUG= -+LINKFLAGSDEBUG=-g - LINKFLAGSOPT= - --_SYSLIBS= -lpthread -lgcc -lc -lm --_X11LIBS= -L/usr/X11R6/lib -lXext -lX11 -+.IF "$(NO_BSYMBOLIC)"=="" -+.IF "$(PRJNAME)" != "envtest" -+LINKFLAGSSHLGUI+=-Wl,-Bsymbolic -+LINKFLAGSSHLCUI+=-Wl,-Bsymbolic -+.ENDIF -+.ENDIF # "$(NO_BSYMBOLIC)"=="" -+ -+LINKVERSIONMAPFLAG=-Wl,--version-script -+ -+SONAME_SWITCH=-Wl,-h -+ -+# Sequence of libs does matter ! - --STDLIBCPP= -lstdc++ -+STDLIBCPP=-lstdc++ -+ -+# default objectfilenames to link - - STDOBJGUI= - STDSLOGUI= - STDOBJCUI= - STDSLOCUI= - --STDLIBGUIST= ${_X11LIBS} ${_SYSLIBS} --STDLIBCUIST= ${_SYSLIBS} --STDLIBGUIMT= ${_X11LIBS} ${_SYSLIBS} --STDLIBCUIMT= ${_SYSLIBS} --STDSHLGUIMT= --STDSHLCUIMT= -- --LIBMGR= ar --LIBFLAGS= -r --LIBEXT= .a -+# libraries for linking applications -+STDLIBCUIST=-lm -+STDLIBGUIMT=-lXaw -lXt -lX11 -lpthread -lm -+STDLIBCUIMT=-lpthread -lm -+STDLIBGUIST=-lXaw -lXt -lX11 -lm -+# libraries for linking shared libraries -+STDSHLGUIMT=-lXaw -lXt -lX11 -lXext -lpthread -lm -lgcc -+STDSHLCUIMT=-lpthread -lm -lgcc -+ -+# STLport always needs pthread. This may yield some redundant -lpthread -+# but that doesn't matter. -+LIBSTLPORT=$(DYNAMIC) -lstlport2_gcc -lpthread -+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -lpthread -+ -+# name of library manager -+LIBMGR=ar -+LIBFLAGS=-r - -+# tool for generating import libraries - IMPLIB= - IMPLIBFLAGS= - -@@ -79,14 +121,12 @@ - MAPSYMFLAGS= - - RC=irc --RCFLAGS= -fo$@ $(RCFILES) -+RCFLAGS=-fo$@ $(RCFILES) - RCLINK= - RCLINKFLAGS= - RCSETVERSION= - --DLLPOSTFIX= bi --DLLPRE= lib --DLLPOST= .so.1.0 -- --LDUMP= -- -+# platform specific identifier for shared libs -+DLLPOSTFIX=bi -+DLLPRE=lib -+DLLPOST=.so diff --git a/editors/openoffice-1.1/files/patch-solenv::inc::unxfbsdi.mk b/editors/openoffice-1.1/files/patch-solenv::inc::unxfbsdi.mk index d1b8dadca9f4..3a5e0498eeaf 100644 --- a/editors/openoffice-1.1/files/patch-solenv::inc::unxfbsdi.mk +++ b/editors/openoffice-1.1/files/patch-solenv::inc::unxfbsdi.mk @@ -1,5 +1,14 @@ ---- ../solenv/inc/unxfbsdi.mk 2001/10/24 17:21:47 1.4 -+++ ../solenv/inc/unxfbsdi.mk 2002/03/03 19:39:21 +--- ../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 +-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 @@ LINKFLAGS= LINKFLAGSAPPGUI= -Wl,-export-dynamic -- cgit v1.2.3