diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2009-10-01 09:16:17 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2009-10-01 09:16:17 +0000 |
commit | 41faa44b020686a511625a4bb92a2edc3c63bf12 (patch) | |
tree | 9e2156864a4df7249f49bec576838f06dbe7ede4 /solenv/inc/unxlngppc.mk | |
parent | 0f8d27d4b47a2a96061aefa9f5ebf755794e3259 (diff) |
CWS-TOOLING: integrate CWS cmcfixes62
2009-09-22 21:19:24 +0200 cmc r276365 : #i100000# that's the most plausible explanation, -D$(CVER) is needed by scp2 under windows
2009-09-19 16:10:36 +0200 cmc r276303 : #i100000# revert this for no partically good reason
2009-09-18 14:16:47 +0200 cmc r276279 : remove extra build depend
2009-09-18 08:56:15 +0200 cmc r276265 : #i100000# rerun autoconf
2009-09-17 14:59:38 +0200 cmc r276245 : CWS-TOOLING: rebase CWS cmcfixes62 to trunk@276192 (milestone: DEV300:m59)
2009-09-10 16:40:49 +0200 pl r276041 : fix warning
2009-09-10 11:34:55 +0200 pl r276026 : disable warning from system header
2009-09-09 19:30:45 +0200 pl r276013 : use osl_getAsciiFunctionSymbol instead of strange cast
2009-09-09 19:25:32 +0200 pl r276012 : add some casting hacks to make compile on solaris cc
2009-09-09 19:10:48 +0200 pl r276009 : add missing Configure option for solaris sparce 32bit
2009-09-09 18:37:05 +0200 pl r276008 : merge fix for #i104525# into moved code
2009-09-07 13:28:08 +0200 cmc r275894 : CWS-TOOLING: rebase CWS cmcfixes62 to trunk@275801 (milestone: DEV300:m57)
2009-08-28 12:36:27 +0200 cmc r275523 : CWS-TOOLING: rebase CWS cmcfixes62 to trunk@275331 (milestone: DEV300:m56)
2009-08-26 12:56:18 +0200 cmc r275413 : #i104088# use the right headers in the right place
2009-08-25 17:07:50 +0200 cmc r275372 : #i104500# make openssl build on linux that isn't x86 or x86_64
2009-08-25 13:08:48 +0200 cmc r275347 : #i89237# pretty picswitch up
2009-08-25 10:58:09 +0200 cmc r275342 : #i104489# remove last unused code in starmath
2009-08-25 10:23:33 +0200 cmc r275338 : #i104088# clean up the define post-move
2009-08-24 13:46:57 +0200 cmc r275310 : #i104088# 64bit odbc api changes
2009-08-24 13:42:52 +0200 cmc r275309 : #i89237# unify linux platform mks under a generic parent
2009-08-24 13:19:52 +0200 cmc r275307 : #i104455# remove unused code
2009-08-24 13:10:56 +0200 cmc r275306 : #i104088# 64bit odbc api changes
2009-08-24 10:07:50 +0200 cmc r275293 : #i104306# move recent-used to vcl
2009-08-24 09:32:08 +0200 cmc r275291 : #i104306# move recent-used to vcl
2009-08-23 22:01:07 +0200 cmc r275286 : #i104306# move recently-used to vcl
2009-08-22 15:25:25 +0200 cmc r275285 : #i104088# 64bit odbc api changes
2009-08-21 17:52:40 +0200 cmc r275268 : #i104306# move recently-used to vcl
2009-08-21 14:38:26 +0200 cmc r275257 : #i104408 make these headers ready for c++0x
2009-08-21 14:20:19 +0200 cmc r275251 : #i104406# avoid overlapping strcpy to avoid bustage on recent toolchains
2009-08-21 14:14:25 +0200 cmc r275250 : #i104385# silence 64bit warnings
Diffstat (limited to 'solenv/inc/unxlngppc.mk')
-rw-r--r-- | solenv/inc/unxlngppc.mk | 186 |
1 files changed, 9 insertions, 177 deletions
diff --git a/solenv/inc/unxlngppc.mk b/solenv/inc/unxlngppc.mk index b1ec2b7ae33a..3a7a8058498c 100644 --- a/solenv/inc/unxlngppc.mk +++ b/solenv/inc/unxlngppc.mk @@ -6,9 +6,9 @@ # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxlngppc.mk,v $ +# $RCSfile: unxlngppc4.mk,v $ # -# $Revision: 1.30 $ +# $Revision: 1.34 $ # # This file is part of OpenOffice.org. # @@ -29,181 +29,13 @@ # #************************************************************************* -# Makefile for linux-ppc -# Christer Gustavsson <cg@nocrew.org> -ASM= -AFLAGS= +# mk file for Unix Linux PowerPC using GCC, please make generic modifications to unxlng.mk -SOLAR_JAVA*= -JAVAFLAGSDEBUG=-g - -# 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) -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) -DPOWERPC -DPPC - -# 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*= - -# name of C++ Compiler -CXX*=g++ -# name of C Compiler -CC*=gcc - -.IF "$(ENABLE_SYMBOLS)" == "SMALL" -CFLAGSENABLESYMBOLS=-g1 -.ELSE -CFLAGSENABLESYMBOLS=-g -.ENDIF -.IF "$(HAVE_LD_HASH_STYLE)" == "TRUE" -LINKFLAGS += -Wl,--hash-style=both -.ELSE -LINKFLAGS += -Wl,-zdynsort -.ENDIF - -# source code is still not signed versus unsigned char clean -CFLAGS=-fsigned-char -nostdinc -c -CFLAGSCC=-fsigned-char $(ARCH_FLAGS) - -# Flags for enabling exception handling -CFLAGSEXCEPTIONS=-fexceptions -# Flags for disabling exception handling -CFLAGS_NO_EXCEPTIONS=-fno-exceptions - -CFLAGSCXX= -pipe -frtti $(ARCH_FLAGS) +DEFAULTOPT=-Os PICSWITCH:=-fPIC - -#Note: the build is not consistent in that it links static librtaries -# libraries into dynamic libraries in places, so use -fPIC throughout -# until fixed. - -# Compiler flags for compiling static object in multi threaded environment with graphical user interface -CFLAGSOBJGUIMT=$(PICSWITCH) -# Compiler flags for compiling static object in multi threaded environment with character user interface -CFLAGSOBJCUIMT=$(PICSWITCH) -# 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 -CFLAGSOPT=-O2 -fno-schedule-insns -fno-strict-aliasing -fno-schedule-insns2 - -# Compiler flags for disabling optimizations -CFLAGSNOOPT=-O0 - -# Compiler flags for describing the output path -CFLAGSOUTOBJ=-o - -CFLAGSWARNCC= -CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy -# -Wshadow does not work for C with nested uses of pthread_cleanup_push: -CFLAGSWALLCC=-Wall -Wextra -Wendif-labels -CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy -CFLAGSWERRCC=-Werror - -# switches for dynamic and static linking -STATIC = -Wl,-Bstatic -DYNAMIC = -Wl,-Bdynamic - -# name of linker -LINK*=$(CXX) -LINKC*=$(CC) -# default linker flags -LINKFLAGS=-Wl,-rpath,\''$$ORIGIN'\' - - -# linker flags for linking applications -LINKFLAGSAPPGUI= -Wl,-export-dynamic -LINKFLAGSAPPCUI= -Wl,-export-dynamic -# linker flags for linking shared libraries -LINKFLAGSSHLGUI= -shared -LINKFLAGSSHLCUI= -shared - -LINKFLAGSTACK= -LINKFLAGSPROF= -LINKFLAGSDEBUG=-g -LINKFLAGSOPT= - -.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++ - -# default objectfilenames to link -STDOBJGUI= -STDSLOGUI= -STDOBJCUI= -STDSLOCUI= - -# libraries for linking applications -STDLIBGUIMT=-lX11 -ldl -lpthread -lm -STDLIBCUIMT=-ldl -lpthread -lm -# libraries for linking shared libraries -STDSHLGUIMT=-lX11 -lXext -ldl -lpthread -lm -STDSHLCUIMT=-ldl -lpthread -lm - -.IF "$(STLPORT_VER)" >= "500" -LIBSTLPORT=$(DYNAMIC) -lstlport -LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC) -.ELSE -LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -.ENDIF - -# 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 +.INCLUDE : unxlng.mk +CDEFS+=-DPOWERPC -DPPC +CFLAGS+=-fsigned-char +CFLAGSCC+=-fsigned-char +CFLAGSCXX+=-fsigned-char DLLPOSTFIX=lp -DLLPRE=lib -DLLPOST=.so |