Kaydet (Commit) 77d3777c authored tarafından Stephan Bergmann's avatar Stephan Bergmann

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
85481258 "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
üst c075b806
......@@ -79,9 +79,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,VISIO,VISIO_TARBALL) \
,$(call fetch_Download_item_special,http://dev-www.libreoffice.org/src,$(item)))
$(foreach item, \
18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz \
7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz \
c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz \
4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz \
$(call fetch_Optional,AFMS,$(AFMS_TARBALL)) \
$(call fetch_Optional,APACHE_COMMONS,$(APACHE_COMMONS_CODEC_TARBALL)) \
......
......@@ -32,7 +32,7 @@ pkg install pkg:/developer/documentation-tool/doxygen@1.5.7.1-0.175.0.0.0.2.537
Compiling
---------
CC="gcc" CXX="g++" ./autogen.sh --with-num-cpus=2 --with-max-jobs=4 --without-junit --disable-mozilla --with-system-curl --without-help --disable-cups --without-java --with-system-cairo --with-lang= --disable-gconf --enable-gio --disable-gnome-vfs --disable-gstreamer --without-fonts --with-system-dicts --without-stlport --disable-mozilla --without-system-mozilla --disable-xmlsec --with-system-openssl
CC="gcc" CXX="g++" ./autogen.sh --with-num-cpus=2 --with-max-jobs=4 --without-junit --disable-mozilla --with-system-curl --without-help --disable-cups --without-java --with-system-cairo --with-lang= --disable-gconf --enable-gio --disable-gnome-vfs --disable-gstreamer --without-fonts --with-system-dicts --disable-mozilla --without-system-mozilla --disable-xmlsec --with-system-openssl
gmake
......
......@@ -96,7 +96,14 @@ SbxVariable* getDefaultProp( SbxVariable* pRef );
#ifdef WNT
#define GradientStyle_RECT BLA_GradientStyle_RECT
#if defined _MSC_VER
#pragma warning (push, 1)
#pragma warning (disable: 4005)
#endif
#include <windows.h>
#if defined _MSC_VER
#pragma warning (pop)
#endif
#include <io.h>
#undef GetObject
#undef GradientSyle_RECT
......
......@@ -219,7 +219,6 @@ export GUI=@GUI@
export GUIBASE=@GUIBASE@
export GUIBASE_FOR_BUILD=@GUIBASE_FOR_BUILD@
export GUI_FOR_BUILD=@GUI_FOR_BUILD@
export GXX_INCLUDE_PATH=@GXX_INCLUDE_PATH@
export HAVE_CXX0X=@HAVE_CXX0X@
export HAVE_GCC_AVX=@HAVE_GCC_AVX@
export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@
......@@ -612,7 +611,6 @@ export WITH_LINKER_HASH_STYLE=@WITH_LINKER_HASH_STYLE@
export WITH_MOZAB4WIN=@WITH_MOZAB4WIN@
export WITH_MYSPELL_DICTS=@WITH_MYSPELL_DICTS@
export WITH_POOR_HELP_LOCALIZATIONS=@WITH_POOR_HELP_LOCALIZATIONS@
export WITH_STLPORT=@WITH_STLPORT@
export WITH_THEMES=@WITH_THEMES@
export WORDS_BIGENDIAN=@WORDS_BIGENDIAN@
export WORKDIR=@WORKDIR@
......
......@@ -1664,13 +1664,6 @@ AC_ARG_WITH(linker-hash-style,
Possible values: "sysv", "gnu", "both". The default value is "gnu"
if supported on the build system, and "sysv" otherwise.]))
AC_ARG_WITH(stlport,
AS_HELP_STRING([--with-stlport],
[Build the STLPort library for compatibility with old extensions for
architectures where STLPort used to be used.]),
with_stlport=$withval ,
with_stlport=auto)
AC_ARG_WITH(jdk-home,
AS_HELP_STRING([--with-jdk-home],
[If you have installed JDK 1.3 or later on your system please supply the
......@@ -1681,15 +1674,6 @@ AC_ARG_WITH(jdk-home,
],
,)
AC_ARG_WITH(gxx_include_path,
AS_HELP_STRING([--with-gxx-include-path],
[If you want to override the autodetected g++ include path.])
[
Usage: --with-gxx-include-path=<absolute path to
g++ include dir>
],
,)
AC_ARG_WITH(help,
AS_HELP_STRING([--without-help],
[Disable the build of help.]))
......@@ -4201,9 +4185,9 @@ if test "$cross_compiling" = "yes"; then
test -f ./config_host.mk 2>/dev/null || exit
cp config_host.mk ../config_build.mk
cp config.log ../config.Build.log
. ./bin/get_config_variables COM GUI GUIBASE OS PATH CPU CPUNAME CC CXX DISABLE_PYTHON GXX_INCLUDE_PATH MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH PYTHON SYSTEM_LIBXSLT OUTDIR SOLARINC SOLARLIB WORKDIR
. ./bin/get_config_variables COM GUI GUIBASE OS PATH CPU CPUNAME CC CXX DISABLE_PYTHON MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH PYTHON SYSTEM_LIBXSLT OUTDIR SOLARINC SOLARLIB WORKDIR
for V in COM GUI GUIBASE OS CPU CPUNAME CC CXX DISABLE_PYTHON GXX_INCLUDE_PATH MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \
for V in COM GUI GUIBASE OS CPU CPUNAME CC CXX DISABLE_PYTHON MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \
PYTHON SYSTEM_LIBXSLT; do
VV='$'$V
VV=`eval "echo $VV"`
......@@ -5463,89 +5447,6 @@ fi
EXCEPTIONS="$exceptions_type"
AC_SUBST(EXCEPTIONS)
dnl ===================================================================
dnl Checks for what the default STL should be
dnl ===================================================================
AC_MSG_CHECKING([Whether building STLPort library makes sense])
BUILD_STLPORT="no"
if test "$_os" = "Linux"; then
case "$host_cpu" in
i?86)
case "$host_os" in
k*bsd*-gnu*)
BUILD_STLPORT="no"
;;
*)
BUILD_STLPORT="yes"
;;
esac
;;
*)
BUILD_STLPORT="no"
;;
esac
elif test "$_os" = "SunOS" -a "$COM" = "C52"; then
BUILD_STLPORT="yes"
elif test "$_os" = "WINNT" -a "$CPUNAME" != X86_64 -a "$WITH_MINGW" != "yes"; then
BUILD_STLPORT="yes"
elif test "$_os" = "FreeBSD"; then
BUILD_STLPORT="yes"
fi
if test "$BUILD_STLPORT" = "yes"; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
fi
AC_MSG_CHECKING([Whether STLPort library will be actually built])
if test "$with_stlport" = "auto" -o "$BUILD_STLPORT" = "no"; then
with_stlport=$BUILD_STLPORT
fi
if test "$with_stlport" = "yes"; then
AC_MSG_RESULT([yes])
WITH_STLPORT=YES
SCPDEFS="$SCPDEFS -DWITH_STLPORT"
BUILD_TYPE="$BUILD_TYPE STLPORT"
else
WITH_STLPORT=NO
AC_MSG_RESULT([no])
fi
AC_SUBST(WITH_STLPORT)
dnl ===================================================================
dnl gxx include directories needed by STLPort
dnl ===================================================================
# Removed the special FreeBSD treatment. The problem was that with_gxx_include_path
# often contains an i386 which is expanded as a macro.
if test "$GXX" = "yes"; then
AC_MSG_CHECKING([for g++ include path])
if test -z "$with_gxx_include_path"; then
with_gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - 2>/dev/null | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
if test "$with_gxx_include_path" = "/usr/libexec/(null)/include"; then
with_gxx_include_path="/usr/include"
fi
if echo $with_gxx_include_path | $GREP -q linux; then
# workaround for Mandriva - issue 100049
with_gxx_include_path=`cd -P $with_gxx_include_path && pwd`
fi
fi
dnl This is the original code...
dnl with_gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
if test -z "$with_gxx_include_path"; then
with_gxx_include_path="NO_GXX_INCLUDE"
AC_MSG_RESULT([none])
else
PathFormat "$with_gxx_include_path"
with_gxx_include_path="$formatted_path"
AC_MSG_RESULT([$with_gxx_include_path])
fi
else
with_gxx_include_path="NO_GXX_INCLUDE"
fi
GXX_INCLUDE_PATH="$with_gxx_include_path"
AC_SUBST(GXX_INCLUDE_PATH)
dnl ===================================================================
dnl thread-safe statics
dnl ===================================================================
......
......@@ -111,6 +111,7 @@
#ifdef WNT
#ifdef _MSC_VER
#pragma warning(push, 1) /* disable warnings within system headers */
#pragma warning (disable: 4005)
#endif
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
......
......@@ -88,7 +88,14 @@
#ifdef WNT
#define GradientStyle_RECT BLA_GradientStyle_RECT
#if defined _MSC_VER
#pragma warning (push, 1)
#pragma warning (disable: 4005)
#endif
#include <windows.h>
#if defined _MSC_VER
#pragma warning (pop)
#endif
#include <objbase.h>
#undef GradientStyle_RECT
#endif
......
......@@ -18,7 +18,6 @@
--disable-systray
--without-junit
--without-ppds
--without-stlport
--without-helppack-integration
--without-myspell-dicts
--with-build-platform-configure-options=--disable-liblangtag
......@@ -18,7 +18,6 @@
--disable-systray
--without-junit
--without-ppds
--without-stlport
--without-helppack-integration
--without-myspell-dicts
--with-build-platform-configure-options=--disable-liblangtag
......@@ -24,4 +24,3 @@
--without-java
--without-junit
--without-ppds
--without-stlport
......@@ -24,8 +24,6 @@
#include <rtl/strbuf.hxx>
#include <memory> /* auto_ptr */
#define MOVEFILE_REPLACE_EXISTING 0x01
/// This Class is responsible for extracting/merging OpenOffice XML Helpfiles
class HelpParser
{
......
......@@ -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 <cstring>" | ${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 <cstring>" | ${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 <cstring>" | ${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
......
......@@ -156,12 +156,6 @@ case ${sdk_platform} in
;;
darwin*)
if [ -n "$OO_SDK_CPP_HOME" ]
then
SDK_GXX_INCLUDE_PATH=`echo "#include <cstring>" | ${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 <cstring>" | ${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 <cstring>" | ${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
......
......@@ -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
......
po postprocess :: CRASHREP:crashrep HELP:helpcontent2 ODK:odk MYSQLC:mysqlc DESKTOP:setup_native STLPORT:stlport sysui tail_build NULL
po postprocess :: CRASHREP:crashrep HELP:helpcontent2 ODK:odk MYSQLC:mysqlc DESKTOP:setup_native sysui tail_build NULL
po postprocess\prj nmake - all po_prj NULL
......@@ -461,8 +461,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Msvcp70_So,
gid_File_Lib_Msvcr70_So,
gid_File_Lib_Gdiplus,
gid_File_Lib_Stlport_Vc6,
gid_File_Lib_Stlport_Vc7,
gid_File_Tabaction,
gid_File_Lib_Fps_Office,
gid_File_Lib_Fpicker,
......
......@@ -842,44 +842,6 @@ Unixlink gid_Unixlink_File_Dl_Libxml2
End
#endif
#if defined WITH_STLPORT
File gid_File_Dl_Stlport
LIB_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
#if defined _gcc3 && defined WNT
#if defined _DEBUG_RUNTIME
Name = SCP2_URE_DL_NORMAL("libstlport_gcc_stldebug");
#else
Name = SCP2_URE_DL_NORMAL("libstlport_gcc");
#endif
#elif defined _gcc3
#if defined _DEBUG_RUNTIME
Name = SCP2_URE_DL_NORMAL("stlport_gcc_stldebug");
#else
Name = SCP2_URE_DL_NORMAL("stlport_gcc");
#endif
#elif defined SOLARIS
#if defined IS_LP64
Name = SCP2_URE_DL_VER("stlport", "1");
#else
#if defined _DEBUG_RUNTIME
Name = SCP2_URE_DL_NORMAL("stlport_sunpro_debug");
#else
Name = SCP2_URE_DL_NORMAL("stlport_sunpro");
#endif
#endif
#elif defined _MSC_VER
#if defined _DEBUG_RUNTIME
Name = SCP2_URE_DL_NORMAL("stlport_vc71_stldebug45");
#else
Name = SCP2_URE_DL_NORMAL("stlport_vc7145");
#endif
#endif
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
// CompID = "D976338D-D2A5-4D29-B765-D3AC43181C7F";
End
#endif
#if defined(WNT) && defined( _gcc3 )
#if defined(MINGW_GCCDLL)
......@@ -1102,7 +1064,6 @@ Module gid_Module_Root_Ure_Hidden
gid_File_Dl_Textoutstream,
gid_File_Dl_Uuresolver,
gid_File_Dl_Libxml2,
gid_File_Dl_Stlport,
gid_File_Lib_Mingw_GccS_Ure,
gid_File_Lib_Mingw_Stdcpp_Ure,
gid_File_Dl_Unicows,
......
......@@ -466,7 +466,7 @@ protected:
{
// this looks funny, since ::std::map does
// provide an erase( iterator )
// method. Unfortunately, stlport does not
// method. Unfortunately, C++ does not
// declare the obvious erase(
// reverse_iterator ) needed here (missing
// orthogonality, eh?)
......
......@@ -21,7 +21,6 @@ static const Path JAVA_HOME;
static const Path UPD;
static const String LIBXML_CFLAGS;
static const String OS;
static const String STLPORT_VER;
static const Bool DEBUG;
static const Bool PRODUCT;
......@@ -70,7 +69,6 @@ namespace gb
static const Path SDKDIR;
};
// GXX_INCLUDE_PATH (Linux)
// PTHREAD_CFLAGS (Linux)
// SYSTEM_ICU (Linux)
// SYSTEM_JPEG (Linux)
......
......@@ -40,7 +40,6 @@ GBUILDDIR:=$(SRCDIR)/solenv/gbuild
# SOLARLIB
# UPD
# GXX_INCLUDE_PATH (Linux)
# PTHREAD_CFLAGS (Linux)
# SYSTEM_ICU (Linux)
# SYSTEM_JPEG (Linux)
......
......@@ -40,10 +40,6 @@ gb_GccLess470 := $(shell expr $(gb_CCVER) \< 40700)
gb_RC := $(WINDRES)
ifeq ($(GXX_INCLUDE_PATH),)
GXX_INCLUDE_PATH=$(COMPATH)/include/c++/$(shell gcc -dumpversion)
endif
gb_COMPILERDEFS += \
-D_MT \
-D_NATIVE_WCHAR_T_DEFINED \
......
......@@ -57,7 +57,6 @@ gb_CPPU_ENV := gcc3
gb_COMPILERDEFS := \
-D$(COM) \
-DCPPU_ENV=$(gb_CPPU_ENV) \
-DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
gb_CFLAGS_COMMON := \
-Wall \
......
......@@ -59,10 +59,6 @@ gb_OSDEFS := \
-DUNX \
$(PTHREAD_CFLAGS) \
ifeq ($(GXX_INCLUDE_PATH),)
GXX_INCLUDE_PATH=$(COMPATH)/include/c++/$(shell gcc -dumpversion)
endif
gb_CFLAGS := \
$(gb_CFLAGS_COMMON) \
-fPIC \
......
......@@ -44,10 +44,6 @@ gb_OSDEFS := \
-DUNX \
$(PTHREAD_CFLAGS) \
ifeq ($(GXX_INCLUDE_PATH),)
GXX_INCLUDE_PATH=$(COMPATH)/include/c++/$(shell gcc -dumpversion)
endif
gb_CFLAGS := \
$(gb_CFLAGS_COMMON) \
-fPIC \
......
......@@ -46,6 +46,7 @@ extern "C" {
#endif
#ifdef _MSC_VER
#pragma warning(push, 1)
#pragma warning (disable: 4005)
#endif
#include <windows.h>
#ifdef _MSC_VER
......
......@@ -1030,12 +1030,6 @@ COMID=$(COM)
.ENDIF "$(USE_JAVAVER)"!=""
.ENDIF # "$(SOLAR_JAVA)"=="TRUE"
.IF "$(COM)"=="GCC"
GXX_INCLUDE_PATH*:=$(COMPATH)/include/c++/$(CCVER)
.EXPORT : GXX_INCLUDE_PATH
CDEFS+= -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH)
.ENDIF
# --- extend new environment ----------------------------------
CDEFS+= -DSUPD=$(UPD)
......
The STLPort library
This is used for compatibility for old extensions for architectures
where STLPort used to be used. Noawadays we use platform native STL.
\ No newline at end of file
--- misc/STLport-4.0/stlport/config/stl_sunpro.h Mon Jul 6 13:43:35 2009
+++ misc/build/STLport-4.0/stlport/config/stl_sunpro.h Mon Jul 6 13:56:56 2009
@@ -31,7 +31,8 @@
# endif
# endif
-# if (__SUNPRO_CC < 0x600)
+// support SunStudio compiler 12u1 version 5.10 (which results in 0x5100)
+# if (__SUNPRO_CC < 0x600 || ((__SUNPRO_CC | 0x0FFF) > 0x0FFF && __SUNPRO_CC < 0x6000))
// those are tested and proved not to work...
# define __STL_STATIC_ARRAY_BUG 1
# define __STL_STATIC_CONST_INIT_BUG 1
@@ -57,7 +58,7 @@
# define __STL_NO_FRIEND_TEMPLATES 1
#endif
-# if (__SUNPRO_CC < 0x600)
+# if (__SUNPRO_CC < 0x600 || ((__SUNPRO_CC | 0x0FFF) > 0x0FFF && __SUNPRO_CC < 0x6000))
# define __STL_HAS_NO_NEW_C_HEADERS 1
# define __STL_NO_EXPLICIT_FUNCTION_TMPL_ARGS
# define __STL_NON_TYPE_TMPL_PARAM_BUG 1
This diff is collapsed.
This diff is collapsed.
--- misc/STLport-4.5/stlport/stl/_locale.h 2001-07-06 05:16:18.000000000 +0100
+++ misc/build/STLport-4.5/stlport/stl/_locale.h 2012-02-18 18:17:18.338109337 +0000
@@ -120,7 +120,7 @@
locale(const locale& __loc, _Facet* __f) : _M_impl(0)
{
// _M_impl = this->_S_copy_impl(__loc._M_impl, __f != 0);
- new(this) locale(__loc._M_impl, __f != 0);
+ new locale(__loc._M_impl, __f != 0);
if (__f != 0)
this->_M_insert(__f, _Facet::id);
}
--- misc/STLport-4.5/stlport/config/stl_gcc.h
+++ misc/build/STLport-4.5/stlport/config/stl_gcc.h
@@ -239,10 +239,10 @@
/* strict ANSI prohibits "long long" ( gcc) */
-# if defined ( __STRICT_ANSI__ )
-# undef _STLP_LONG_LONG
-// # define _STLP_STRICT_ANSI 1
-# endif
+//# if defined ( __STRICT_ANSI__ )
+//# undef _STLP_LONG_LONG
+//// # define _STLP_STRICT_ANSI 1
+//# endif
//# if !defined (__STRICT_ANSI__) || defined (__BUILDING_STLPORT)
//# define _STLP_USE_TEMPLATE_EXPORT
--- misc/STLport-4.5/src/num_get_float.cpp 2001-05-03 09:40:43.000000000 +0200
+++ misc/build/STLport-4.5/src/num_get_float.cpp 2009-03-22 17:31:30.000000000 +0100
@@ -484,7 +484,7 @@
else { /* not zero or denorm */
/* Round to 53 bits */
- rest = value & (1<<10)-1;
+ rest = value & ((1<<10)-1);
value >>= 10;
#if !defined(__SC__)
guard = (uint32) value & 1;
--- misc/STLport-4.5/src/strstream.cpp 2001-01-27 02:39:29.000000000 +0100
+++ misc/build/STLport-4.5/src/strstream.cpp 2009-03-22 17:26:32.000000000 +0100
@@ -284,11 +284,12 @@
void strstreambuf::_M_free(char* p)
{
- if (p)
+ if (p) {
if (_M_free_fun)
_M_free_fun(p);
else
delete[] p;
+ }
}
void strstreambuf::_M_setup(char* get, char* put, streamsize n)
--- misc/STLport-4.5/stlport/stl/_list.c 2001-05-11 04:20:07.000000000 +0200
+++ misc/build/STLport-4.5/stlport/stl/_list.c 2009-03-22 17:26:32.000000000 +0100
@@ -82,7 +82,7 @@
{
iterator __i = begin();
size_type __len = 0;
- for ( ; __i != end() && __len < __new_size; ++__i, ++__len);
+ for ( ; __i != end() && __len < __new_size; ++__i, ++__len) ;
if (__len == __new_size)
erase(__i, end());
--- misc/STLport-4.5/stlport/stl/_time_facets.c 2001-03-19 08:01:09.000000000 +0100
+++ misc/build/STLport-4.5/stlport/stl/_time_facets.c 2009-03-22 17:26:32.000000000 +0100
@@ -101,7 +101,7 @@
while (__first != __last) {
for (__i = 0; __i < __n; ++__i)
- if (__do_check[__i])
+ if (__do_check[__i]) {
if (*__first == __name[__i][__pos]) {
if (__pos == _DiffType(__name[__i].size()) - 1) {
__do_check[__i] = 0;
@@ -119,6 +119,7 @@
if (__check_count == 0)
return __matching_name[__pos];
}
+ }
++__first; ++__pos;
}
--- misc/STLport-4.5/stlport/stl/_tree.c 2009-03-22 17:04:36.000000000 +0100
+++ misc/build/STLport-4.5/stlport/stl/_tree.c 2009-03-22 17:26:32.000000000 +0100
@@ -186,18 +186,20 @@
__z->_M_parent->_M_left = __x;
else
__z->_M_parent->_M_right = __x;
- if (__leftmost == __z)
+ if (__leftmost == __z) {
if (__z->_M_right == 0) // __z->_M_left must be null also
__leftmost = __z->_M_parent;
// makes __leftmost == _M_header if __z == __root
else
__leftmost = _Rb_tree_node_base::_S_minimum(__x);
- if (__rightmost == __z)
+ }
+ if (__rightmost == __z) {
if (__z->_M_left == 0) // __z->_M_right must be null also
__rightmost = __z->_M_parent;
// makes __rightmost == _M_header if __z == __root
else // __x == __z->_M_left
__rightmost = _Rb_tree_node_base::_S_maximum(__x);
+ }
}
if (__y->_M_color != _S_rb_tree_red) {
while (__x != __root && (__x == 0 || __x->_M_color == _S_rb_tree_black))
--- misc/STLport-4.5/stlport/stl/debug/_debug.c 2001-05-30 05:45:43.000000000 +0200
+++ misc/build/STLport-4.5/stlport/stl/debug/_debug.c 2009-03-22 17:26:32.000000000 +0100
@@ -58,7 +58,7 @@
# endif
const _Iterator& __last, const forward_iterator_tag &) {
_Iterator1 __i(__first);
- for (; __i != __last && __i != __it; ++__i);
+ for (; __i != __last && __i != __it; ++__i) ;
return (__i!=__last);
}
@@ -68,7 +68,7 @@
__in_range_aux(const _Iterator1& __it, const _Iterator& __first,
const _Iterator& __last, const bidirectional_iterator_tag &) {
_Iterator1 __i(__first);
- for (; __i != __last && __i != __it; ++__i);
+ for (; __i != __last && __i != __it; ++__i) ;
return (__i !=__last);
}
# endif
--- misc/STLport-4.5/stlport/stl/debug/_list.h 2001-05-30 05:45:43.000000000 +0200
+++ misc/build/STLport-4.5/stlport/stl/debug/_list.h 2009-03-22 17:26:32.000000000 +0100
@@ -209,7 +209,7 @@
void resize(size_type __new_size, const _Tp& __x) {
typename _Base::iterator __i = _Base::begin();
size_type __len = 0;
- for ( ; __i != _Base::end() && __len < __new_size; ++__i, ++__len);
+ for ( ; __i != _Base::end() && __len < __new_size; ++__i, ++__len) ;
if (__len == __new_size)
erase(iterator(&_M_iter_list,__i), end());
This diff is collapsed.
*** ./unxsols3.pro/misc/STLport-4.0/src/vc_common.mak Fri Jul 14 03:53:26 2000
--- build/unxsols3.pro/STLport-4.0/src/vc_common.mak Fri Oct 5 15:34:10 2001
***************
*** 42,48 ****
LDFLAGS_COMMON_static=/nologo /machine:I386
! LDFLAGS_COMMON_dynamic=/nologo /dll /incremental:no /machine:I386
CXXFLAGS_DEBUG_static=$(FLAGS_COMMON_static) /MTd /Zi /Yd /Gm /Od /D "_DEBUG" /Fo"$(DEBUG_OBJDIR_static)\\" /Fd"$(DEBUG_OBJDIR_static)\\" /YXstlport_prefix.h /Fp$(DEBUG_OBJDIR_static)\stlport.pch /c
--- 42,48 ----
LDFLAGS_COMMON_static=/nologo /machine:I386
! LDFLAGS_COMMON_dynamic=/nologo /nodefaultlib oldnames.lib kernel32.lib /dll /incremental:no /machine:I386
CXXFLAGS_DEBUG_static=$(FLAGS_COMMON_static) /MTd /Zi /Yd /Gm /Od /D "_DEBUG" /Fo"$(DEBUG_OBJDIR_static)\\" /Fd"$(DEBUG_OBJDIR_static)\\" /YXstlport_prefix.h /Fp$(DEBUG_OBJDIR_static)\stlport.pch /c
***************
*** 53,62 ****
CXXFLAGS_STLDEBUG_dynamic=$(FLAGS_COMMON_dynamic) /MDd /Zi /Yd /Gm /Od /D "_DEBUG" /D "__STL_DEBUG" /Fo"$(STLDEBUG_OBJDIR_dynamic)\\" /Fd"$(STLDEBUG_OBJDIR_dynamic)\\" /YXstlport_prefix.h /Fp$(STLDEBUG_OBJDIR_dynamic)\stlport.pch /c
LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static) /NODEFAULTLIB:MTD /DEBUGTYPE:CV
! LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)"
LDFLAGS_STLDEBUG_static=$(LDFLAGS_COMMON_static) /NODEFAULTLIB:MTD /DEBUGTYPE:CV
! LDFLAGS_STLDEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(STLDEBUG_NAME).$(STEXT)"
CXXFLAGS_RELEASE_static=$(FLAGS_COMMON_static) /O2 /MT /D "NDEBUG" /Fo"$(RELEASE_OBJDIR_static)\\" /Fd"$(RELEASE_OBJDIR_static)\\" /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_static)\stlport.pch /c
--- 53,62 ----
CXXFLAGS_STLDEBUG_dynamic=$(FLAGS_COMMON_dynamic) /MDd /Zi /Yd /Gm /Od /D "_DEBUG" /D "__STL_DEBUG" /Fo"$(STLDEBUG_OBJDIR_dynamic)\\" /Fd"$(STLDEBUG_OBJDIR_dynamic)\\" /YXstlport_prefix.h /Fp$(STLDEBUG_OBJDIR_dynamic)\stlport.pch /c
LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static) /NODEFAULTLIB:MTD /DEBUGTYPE:CV
! LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) msvcrtd.lib /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)"