From 77d3777c8934171a9557a96872d020cf12443fb9 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 13 Dec 2012 16:52:50 +0100 Subject: Remove --with-stlport from LO 4.0 The STLport was only built for the benefit of old extensions on platforms that once used it themselves (Linux x86, Solaris x86 and SPARC, Windows). We deliberately break such old extensions for LO 4.0 by no longer shipping that backwards-compatiblity cludge. Keeps STLport listed in readlicense_oo/ because of o3tl/inc/o3tl/compat_functionality.hxx. Also removes GXX_INCLUDE_PATH, as that was only used by STLport (if at all?). Removes a spurious #define MOVEFILE_REPLACE_EXISTING 0x01 from l10ntools/inc/helpmerge.hxx that was once added with 854812584862d0609b695682d2bfea2667d75c00 "INTEGRATION: CWS extensionl10nfix01 (1.11.6); FILE MERGED: 2008/06/26 13:56:03 ihi 1.11.6.1: #i90987# windows rename -> MoveFileEx" but now starts to cause trouble on Windows. Also disables warning C4005 about redefinition of WB_LEFT/RIGHT macros (defined in both tools/wintypes.hxx and the Windows API) in a number of places that include windows.h -- however the old STLport caused those warnings to not show. Change-Id: Ie138a219fbbc86fb5aaa7ea0b88cf349935d9829 --- odk/setsdkenv_unix.csh.in | 15 --------------- odk/setsdkenv_unix.sh.in | 18 ------------------ odk/settings/settings.mk | 16 ++++++++-------- 3 files changed, 8 insertions(+), 41 deletions(-) (limited to 'odk') diff --git a/odk/setsdkenv_unix.csh.in b/odk/setsdkenv_unix.csh.in index 567f40653328..c7394146a5a4 100644 --- a/odk/setsdkenv_unix.csh.in +++ b/odk/setsdkenv_unix.csh.in @@ -129,11 +129,6 @@ switch (`${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4`) breaksw case "linux-gnu": - if ( $?OO_SDK_CPP_HOME == 0) then - set sdk_gxx_include_path=`echo "#include " | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1` - setenv SDK_GXX_INCLUDE_PATH ${sdk_gxx_include_path} - endif - set directoryname=linux set comid=gcc3 set pltfrm=gcc @@ -150,11 +145,6 @@ switch (`${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4`) breaksw case "darwin*": - if ( $?OO_SDK_CPP_HOME == 0) then - set sdk_gxx_include_path=`echo "#include " | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1` - setenv SDK_GXX_INCLUDE_PATH ${sdk_gxx_include_path} - endif - set directoryname=macosx set comid=gcc3 set pltfrm=gcc @@ -171,11 +161,6 @@ switch (`${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4`) breaksw case "freebsd*": - if ( $?OO_SDK_CPP_HOME == 0) then - set sdk_gxx_include_path=`echo "#include " | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1` - setenv SDK_GXX_INCLUDE_PATH ${sdk_gxx_include_path} - endif - set directoryname=freebsd set comid=gcc3 set pltfrm=gcc diff --git a/odk/setsdkenv_unix.sh.in b/odk/setsdkenv_unix.sh.in index de1527639abf..118154822319 100644 --- a/odk/setsdkenv_unix.sh.in +++ b/odk/setsdkenv_unix.sh.in @@ -156,12 +156,6 @@ case ${sdk_platform} in ;; darwin*) - if [ -n "$OO_SDK_CPP_HOME" ] - then - SDK_GXX_INCLUDE_PATH=`echo "#include " | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1` - export SDK_GXX_INCLUDE_PATH - fi - directoryname=macosx comid=gcc3 pltfrm=gcc @@ -173,12 +167,6 @@ case ${sdk_platform} in ;; linux-gnu) - if [ -n "$OO_SDK_CPP_HOME" ] - then - SDK_GXX_INCLUDE_PATH=`echo "#include " | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1` - export SDK_GXX_INCLUDE_PATH - fi - directoryname=linux comid=gcc3 pltfrm=gcc @@ -190,12 +178,6 @@ case ${sdk_platform} in ;; freebsd*) - if [ -n "$OO_SDK_CPP_HOME" ] - then - SDK_GXX_INCLUDE_PATH=`echo "#include " | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1` - export SDK_GXX_INCLUDE_PATH - fi - directoryname=freebsd comid=gcc3 pltfrm=gcc diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index ed7aff6d7edd..a71be272cfec 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -228,9 +228,9 @@ SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/inclu # -DCPPU_ENV=sunpro5 -- sunpro cc 5.x solaris sparc/intel #CC_DEFINES_JNI=-DUNX -DSOLARIS -DCPPU_ENV=sunpro5 -CC_DEFINES_JNI=-DUNX -DSOLARIS -DCPPU_ENV=$(CPPU_ENV) -DGCC -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH) +CC_DEFINES_JNI=-DUNX -DSOLARIS -DCPPU_ENV=$(CPPU_ENV) -DGCC #CC_DEFINES=-DUNX -DSOLARIS -DSPARC -DCPPU_ENV=sunpro5 -DHAVE_GCC_VISIBILITY_FEATURE -CC_DEFINES=-DUNX -DSOLARIS -DSPARC -DCPPU_ENV=$(CPPU_ENV) -DHAVE_GCC_VISIBILITY_FEATURE -DGCC -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH) +CC_DEFINES=-DUNX -DSOLARIS -DSPARC -DCPPU_ENV=$(CPPU_ENV) -DHAVE_GCC_VISIBILITY_FEATURE -DGCC CC_OUTPUT_SWITCH=-o #LIBRARY_LINK_FLAGS=-w -mt -z combreloc -PIC -temp=/tmp '-R$$ORIGIN' -z text -norunpath -G -Bdirect -Bdynamic -lpthread -lCrun -lc -lm @@ -358,8 +358,8 @@ endif SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/include/linux" CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include -CC_DEFINES_JNI=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH) -CC_DEFINES=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH) -DHAVE_GCC_VISIBILITY_FEATURE +CC_DEFINES_JNI=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV) +CC_DEFINES=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV) -DHAVE_GCC_VISIBILITY_FEATURE CC_OUTPUT_SWITCH=-o @@ -479,8 +479,8 @@ endif SDK_JAVA_INCLUDES = -I/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers -I/System/Library/Frameworks/JavaVM.framework/Headers CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include -CC_DEFINES_JNI=-DUNX -DGCC -DMACOSX -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH) -CC_DEFINES=-DUNX -DGCC -DMACOSX -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH) -DHAVE_GCC_VISIBILITY_FEATURE +CC_DEFINES_JNI=-DUNX -DGCC -DMACOSX -DCPPU_ENV=$(CPPU_ENV) +CC_DEFINES=-DUNX -DGCC -DMACOSX -DCPPU_ENV=$(CPPU_ENV) -DHAVE_GCC_VISIBILITY_FEATURE CC_OUTPUT_SWITCH=-o @@ -593,8 +593,8 @@ endif SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/include/freebsd" CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include -CC_DEFINES_JNI=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH) -CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH) -DHAVE_GCC_VISIBILITY_FEATURE +CC_DEFINES_JNI=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) +CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) -DHAVE_GCC_VISIBILITY_FEATURE CC_OUTPUT_SWITCH=-o -- cgit