[Libreoffice-commits] .: 3 commits - configure.in scp2/inc scp2/source set_soenv.in solenv/bin solenv/inc soltools/util stlport/makefile.mk stlport/prj stlport/STLport-4.5.patch stlport/systemstlguards
Fridrich Strba
fridrich at kemper.freedesktop.org
Wed Feb 9 11:23:40 PST 2011
configure.in | 154 +++++++--------------------------
scp2/inc/macros.inc | 2
scp2/source/ooo/common_brand.scp | 8 -
scp2/source/ooo/file_library_ooo.scp | 10 +-
scp2/source/ooo/makefile.mk | 4
scp2/source/ooo/mergemodules_ooo.scp | 4
scp2/source/ooo/ure.scp | 21 +---
scp2/source/winexplorerext/makefile.mk | 4
set_soenv.in | 60 +-----------
solenv/bin/addsym.awk | 4
solenv/inc/doxygen.cfg | 2
solenv/inc/os2gcci.mk | 5 -
solenv/inc/settings.mk | 19 +---
solenv/inc/tg_ext.mk | 4
solenv/inc/unxbsdi.mk | 10 --
solenv/inc/unxbsdi2.mk | 13 --
solenv/inc/unxbsdi3.mk | 7 -
solenv/inc/unxbsds.mk | 12 --
solenv/inc/unxbsdx3.mk | 7 -
solenv/inc/unxfbsd.mk | 22 ----
solenv/inc/unxgcc.mk | 29 ------
solenv/inc/unxmacx.mk | 26 -----
solenv/inc/unxsogi.mk | 10 --
solenv/inc/unxsogs.mk | 10 --
solenv/inc/unxsoli4.mk | 10 --
solenv/inc/unxsols4.mk | 10 --
solenv/inc/unxsolu4.mk | 12 --
solenv/inc/wntgcci.mk | 5 -
solenv/inc/wntmsc.mk | 48 ++--------
soltools/util/makefile.pmk | 10 --
stlport/STLport-4.5.patch | 32 +++---
stlport/makefile.mk | 16 ---
stlport/prj/d.lst | 22 ----
stlport/systemstlguards/postextstl.h | 38 --------
stlport/systemstlguards/preextstl.h | 95 --------------------
35 files changed, 113 insertions(+), 632 deletions(-)
New commits:
commit 13fbe657ad8acb7a24aa3ca734aa9100cff7cb22
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Feb 9 16:19:51 2011 +0100
Trying to remove the stlport mention from the code
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 3fa2f8b..8bf6350 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -576,7 +576,7 @@ End
#define SCP2_URE_DL_UNO_VER(n, v) n v ".dll"
#define SCP2_URE_DL_UNO_COMID_VER(n, v) n v STRING(COMID) ".dll"
#define SCP2_URE_SHARE_DIR gid_Dir_Common_Ure
-#if defined _STLP_DEBUG
+#if defined _DEBUG_RUNTIME
#define SCP2_STDLP_DEBUG "d"
#else
#define SCP2_STDLP_DEBUG ""
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index c47ce74..bf492df 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -792,7 +792,7 @@ File gid_Brand_File_Lib_Msvcr80
BIN_FILE_BODY;
Styles = (PACKED);
Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
Name = "msvcr80.dll";
#else
Name = "msvcr80d.dll";
@@ -835,7 +835,7 @@ File gid_Brand_File_Lib_Msvcp80
BIN_FILE_BODY;
Styles = (PACKED);
Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
Name = "msvcp80.dll";
#else
Name = "msvcp80d.dll";
@@ -852,7 +852,7 @@ File gid_Brand_File_Lib_Msvcm80
BIN_FILE_BODY;
Styles = (PACKED);
Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
Name = "msvcm80.dll";
#else
Name = "msvcm80d.dll";
@@ -869,7 +869,7 @@ File gid_Brand_File_Msvcm80crt_Manifest
BIN_FILE_BODY;
Styles = (PACKED);
Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
Name = "Microsoft.VC80.CRT.manifest";
#else
Name = "Microsoft.VC80.DebugCRT.manifest";
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index e30422e..2349c4b 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -993,7 +993,7 @@ File gid_File_Lib_Msvcr80
BIN_FILE_BODY;
Styles = (PACKED);
Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
Name = "msvcr80.dll";
#else
Name = "msvcr80d.dll";
@@ -1010,7 +1010,7 @@ File gid_File_Lib_Msvcp80
BIN_FILE_BODY;
Styles = (PACKED);
Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
Name = "msvcp80.dll";
#else
Name = "msvcp80d.dll";
@@ -1027,7 +1027,7 @@ File gid_File_Lib_Msvcm80
BIN_FILE_BODY;
Styles = (PACKED);
Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
Name = "msvcm80.dll";
#else
Name = "msvcm80d.dll";
@@ -1070,7 +1070,7 @@ File gid_File_Msvcm80crt_Manifest
BIN_FILE_BODY;
Styles = (PACKED);
Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
Name = "Microsoft.VC80.CRT.manifest";
#else
Name = "Microsoft.VC80.DebugCRT.manifest";
@@ -1782,7 +1782,7 @@ End
STD_UNO_LIB_FILE( gid_File_Lib_Oooimprovecore , oooimprovecore)
#if defined WNT && !defined _gcc3 && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA && \
- !(defined M1400 && defined PROF_EDITION && !defined _STLP_DEBUG)
+ !(defined M1400 && defined PROF_EDITION && !defined _DEBUG_RUNTIME)
// see common_brand.scp gid_Brand_File_Lib_Msvcp80 and
// gid_Brand_File_Lib_Msvcr80
File gid_File_Moz_Msvcp80
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 87c6801..b2dec77 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -126,10 +126,6 @@ SCPDEFS+=-DLIBXSLT_MAJOR=$(LIBXSLT_MAJOR)
SCPDEFS+=-DSYSTEM_DB
.ENDIF
-.IF "$(USE_SYSTEM_STL)" == "YES" || "$(STLPORT4)" != "NO_STLPORT4"
-SCPDEFS+=-DUSE_SYSTEM_STL
-.ENDIF
-
.IF "$(WITH_MOZILLA)" == "NO"
SCPDEFS+=-DWITHOUT_MOZILLA
.ENDIF
diff --git a/scp2/source/ooo/mergemodules_ooo.scp b/scp2/source/ooo/mergemodules_ooo.scp
index f88cce4..b19ca8c 100755
--- a/scp2/source/ooo/mergemodules_ooo.scp
+++ b/scp2/source/ooo/mergemodules_ooo.scp
@@ -29,7 +29,7 @@
#ifdef M1500
MergeModule gid_Mergemodule_Microsoft_Vc90_Crt_X86
-#ifdef _STLP_DEBUG
+#ifdef _DEBUG_RUNTIME
Name = "Microsoft_VC90_DebugCRT_x86.msm";
#else
Name = "Microsoft_VC90_CRT_x86.msm";
@@ -43,7 +43,7 @@ End
#ifdef M1500
MergeModule gid_Mergemodule_Policy_Microsoft_Vc90_Crt_X86
-#ifdef _STLP_DEBUG
+#ifdef _DEBUG_RUNTIME
Name = "policy_9_0_Microsoft_VC90_DebugCRT_x86.msm";
#else
Name = "policy_9_0_Microsoft_VC90_CRT_x86.msm";
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index ce790cb..cda47b4 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -177,7 +177,7 @@ File gid_File_Lib_Msvcr80_Ure
BIN_FILE_BODY;
Styles = (PACKED);
Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
Name = "msvcr80.dll";
#else
Name = "msvcr80d.dll";
@@ -194,7 +194,7 @@ File gid_File_Lib_Msvcp80_Ure
BIN_FILE_BODY;
Styles = (PACKED);
Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
Name = "msvcp80.dll";
#else
Name = "msvcp80d.dll";
@@ -211,7 +211,7 @@ File gid_File_Lib_Msvcm80_Ure
BIN_FILE_BODY;
Styles = (PACKED);
Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
Name = "msvcm80.dll";
#else
Name = "msvcm80d.dll";
@@ -228,7 +228,7 @@ File gid_File_Msvcm80crt_Manifest_Ure
BIN_FILE_BODY;
Styles = (PACKED);
Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
Name = "Microsoft.VC80.CRT.manifest";
#else
Name = "Microsoft.VC80.DebugCRT.manifest";
@@ -961,19 +961,18 @@ Unixlink gid_Unixlink_File_Dl_Libxml2
End
#endif
-#if !defined USE_SYSTEM_STL || \
- (defined USE_SYSTEM_STL && defined _C52 && defined IS_LP64)
+#if defined WITH_STLPORT
File gid_File_Dl_Stlport
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
#if defined _gcc3 && defined WNT
-#if defined _STLP_DEBUG
+#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 _STLP_DEBUG
+#if defined _DEBUG_RUNTIME
Name = SCP2_URE_DL_NORMAL("stlport_gcc_stldebug");
#else
Name = SCP2_URE_DL_NORMAL("stlport_gcc");
@@ -982,20 +981,18 @@ File gid_File_Dl_Stlport
#if defined IS_LP64
Name = SCP2_URE_DL_VER("stlport", "1");
#else
-#if defined _STLP_DEBUG
+#if defined _DEBUG_RUNTIME
Name = SCP2_URE_DL_NORMAL("stlport_sunpro_debug");
#else
Name = SCP2_URE_DL_NORMAL("stlport_sunpro");
#endif
#endif
#elif defined WNT && (defined(M1310) || defined(M1400) || defined(M1500) || defined (M1600) )
-#if defined _STLP_DEBUG
+#if defined _DEBUG_RUNTIME
Name = SCP2_URE_DL_NORMAL("stlport_vc71_stldebug45");
#else
Name = SCP2_URE_DL_NORMAL("stlport_vc7145");
#endif
-#else
-#error "stlport dynamic library: unsupported platform"
#endif
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
// CompID = "D976338D-D2A5-4D29-B765-D3AC43181C7F";
diff --git a/scp2/source/winexplorerext/makefile.mk b/scp2/source/winexplorerext/makefile.mk
index 21eaad7..435ed43 100755
--- a/scp2/source/winexplorerext/makefile.mk
+++ b/scp2/source/winexplorerext/makefile.mk
@@ -50,10 +50,6 @@ PARFILES= \
registryitem_winexplorerext.par
.ENDIF
-.IF "$(USE_SYSTEM_STL)" == "YES" || "$(STLPORT4)" != "NO_STLPORT4"
-SCPDEFS+=-DUSE_SYSTEM_STL
-.ENDIF
-
ULFFILES= \
module_winexplorerext.ulf
diff --git a/solenv/bin/addsym.awk b/solenv/bin/addsym.awk
index 621ca2e..de0b579 100644
--- a/solenv/bin/addsym.awk
+++ b/solenv/bin/addsym.awk
@@ -37,15 +37,11 @@ END {
print "UDK_3_0_0 {"
print "global:"
print "_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
- if (ENVIRON["USE_SYSTEM_STL"] != "YES")
- print "_ZN4_STL7num_put*; # for STLport"
print "};"
}
}
state == 2 {
print "_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
- if (ENVIRON["USE_SYSTEM_STL"] != "YES")
- print "_ZN4_STL7num_put*; # for STLport"
state = 3
}
# #i66636# - ???
diff --git a/solenv/inc/doxygen.cfg b/solenv/inc/doxygen.cfg
index 36be3c2..aa39299 100644
--- a/solenv/inc/doxygen.cfg
+++ b/solenv/inc/doxygen.cfg
@@ -1061,7 +1061,7 @@ PREDEFINED = LINUX \
GCC \
C341 \
X86_64 \
- _STLP_DEBUG \
+ _DEBUG_RUNTIME \
VER=C341 \
NPTL \
GLIBC=2 \
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index d8a92a6..203a44f 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -479,7 +479,7 @@ DBG_LEVEL*=0
optimize!=true
dbgutil!=true
DBG_LEVEL*=1
-USE_STLP_DEBUG*=TRUE
+USE_DEBUG_RUNTIME*=TRUE
.ENDIF
.IF "$(debug)"!=""
@@ -856,8 +856,8 @@ LIB:=$(LB);$(BIN);$(ILIB)
CPUNAME=CPUNAME_HAS_TO_BE_SET_IN_ENVIRONMENT
.ENDIF
-.IF "$(USE_STLP_DEBUG)" != ""
-SCPCDEFS+=-D_STLP_DEBUG
+.IF "$(USE_DEBUG_RUNTIME)" != ""
+SCPCDEFS+=-D_DEBUG_RUNTIME
.ENDIF
.IF "$(UDK_MAJOR)"!=""
@@ -883,8 +883,8 @@ UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)/inc -I$(PRJ)/$(INPATH)/idl -I$(OUT)/inc -I
CDEFS= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -D$(CVER) -D$(CPUNAME)
-.IF "$(USE_STLP_DEBUG)" != "" && "$(GUI)"!="OS2"
-CDEFS+=-D_STLP_DEBUG
+.IF "$(USE_DEBUG_RUNTIME)" != "" && "$(GUI)"!="OS2"
+CDEFS+=-D_DEBUG_RUNTIME
.ENDIF
.IF "$(CDEFS_PRESET)" != ""
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index 17d9422..1343955 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -39,9 +39,6 @@ LINKOUTPUT_FILTER=
# -D_PTHREADS and -D_REENTRANT are needed for STLport, and must be specified when
# compiling STLport sources too, either internally or externally.
CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFINES) -D_USE_NAMESPACE=1
-.IF "$(GUIBASE)"=="unx" && "$(USE_SYSTEM_STL)"!="YES"
-CDEFS+=-DX_LOCALE
-.ENDIF
.IF "$(GUIBASE)"=="aqua"
# MAXOSX_DEPLOYMENT_TARGET : The minimum version required to run the build,
# build can assume functions/libraries of that version to be available
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index cbe7b3e..7a10abe 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -296,38 +296,23 @@ LINKFLAGSOPT=
UWINAPILIB*=uwinapi.lib
.IF "$(DYNAMIC_CRT)"!=""
-.IF "$(USE_STLP_DEBUG)" != ""
+.IF "$(USE_DEBUG_RUNTIME)" != ""
LIBCMT=msvcrtd.lib
-.ELSE # "$(USE_STLP_DEBUG)" != ""
-LIBCMT=msvcrt.lib
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-.ELSE # "$(DYNAMIC_CRT)"!=""
-.IF "$(USE_STLP_DEBUG)" != ""
-LIBCMT=libcmtd.lib
-CDEFS+=-D_DEBUG
-.ELSE # "$(USE_STLP_DEBUG)" != ""
-LIBCMT=libcmt.lib
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-.ENDIF # "$(DYNAMIC_CRT)"!=""
-
-.IF "$(USE_SYSTEM_STL)"=="YES"
-.IF "$(DYNAMIC_CRT)"!=""
-.IF "$(USE_STLP_DEBUG)" != ""
LIBCPMT=msvcprtd.lib
-.ELSE # "$(USE_STLP_DEBUG)" != ""
+.ELSE # "$(USE_DEBUG_RUNTIME)" != ""
+LIBCMT=msvcrt.lib
LIBCPMT=msvcprt.lib
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
+.ENDIF # "$(USE_DEBUG_RUNTIME)" != ""
.ELSE # "$(DYNAMIC_CRT)"!=""
-.IF "$(USE_STLP_DEBUG)" != ""
+.IF "$(USE_DEBUG_RUNTIME)" != ""
+LIBCMT=libcmtd.lib
LIBCPMT=libcpmtd.lib
CDEFS+=-D_DEBUG
-.ELSE # "$(USE_STLP_DEBUG)" != ""
+.ELSE # "$(USE_DEBUG_RUNTIME)" != ""
+LIBCMT=libcmt.lib
LIBCPMT=libcpmt.lib
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
+.ENDIF # "$(USE_DEBUG_RUNTIME)" != ""
.ENDIF # "$(DYNAMIC_CRT)"!=""
-.ELSE # "$(USE_SYSTEM_STL)"=="YES"
-LIBCPMT=
-.ENDIF # "$(USE_SYSTEM_STL)"=="YES"
STDOBJVCL=$(L)/salmain.obj
STDOBJGUI=
diff --git a/soltools/util/makefile.pmk b/soltools/util/makefile.pmk
index bf51cf8..003cf1c 100755
--- a/soltools/util/makefile.pmk
+++ b/soltools/util/makefile.pmk
@@ -31,14 +31,6 @@ MAKEDEPEND=$(AUGMENT_LIBRARY_PATH) $(BIN)$/makedepend
# find 'adjustvisibility' in own output tree
ADJUSTVISIBILITY=$(AUGMENT_LIBRARY_PATH) $(BIN)$/adjustvisibility
-# avoid STLPort
-NO_DEFAULT_STL=TRUE
-SOLARINC!:=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(SOLARINC))
-.IF "$(STLPORT4)" != ""
-SOLARINC!:=$(subst,$(STLPORT4)/include/stlport,dont_use_stl$(SPACECHAR) $(SOLARINC))
-SOLARINC!:=$(subst,$(STLPORT4)/stlport,dont_use_stl$(SPACECHAR) $(SOLARINC))
-.ENDIF
-
.IF "$(OS)"=="SOLARIS"
# hack due to #i53089#
.IF "$(COMPATH:+"x")" != "$(COMPATH:+"x":s/binx//)"
@@ -46,7 +38,5 @@ HELP_COMPATH:=$(subst,/binx, $(COMPATH:+"x"))
.ELSE # "$(COMPATH:+"x")" == "$(COMPATH:s/binx//)/binx"
HELP_COMPATH:=$(COMPATH)
.ENDIF # "$(COMPATH:+"x")" == "$(COMPATH:s/binx//)/binx"
-#SOLARINC+=-I$(HELP_COMPATH)/prod/include/CC/stlport4
-#SOLARLIB+=-L$(HELP_COMPATH)/prod/lib/stlport4
SOLARINC+=-I$(HELP_COMPATH)/prod/include/CC/Cstd
.ENDIF
diff --git a/stlport/STLport-4.5.patch b/stlport/STLport-4.5.patch
index 8476053..0a00275 100644
--- a/stlport/STLport-4.5.patch
+++ b/stlport/STLport-4.5.patch
@@ -163,8 +163,8 @@
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
+
-+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
+
+CFLAGS_RELEASE_static = $(CFLAGS_COMMON) -O2 -fPIC
+CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -O2 -fPIC
@@ -172,8 +172,8 @@
+CFLAGS_DEBUG_static = $(CFLAGS_COMMON) -g -fPIC
+CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -g -fPIC
+
-+CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_STLP_DEBUG
-+CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
++CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
+
+include common_percent_rules.mak
+include common_rules.mak
@@ -255,8 +255,8 @@
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -shared -g -D_DLL -D_STLP_USE_DYNAMIC_LIB -D_STLP_DLLEXPORT_NEEDS_PREDECLARATION
+
-+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
+
+CFLAGS_RELEASE_static = $(CFLAGS_COMMON) -O2
+CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -shared -O2 -D_DLL -D_STLP_USE_DYNAMIC_LIB -D_STLP_DLLEXPORT_NEEDS_PREDECLARATION
@@ -264,8 +264,8 @@
+CFLAGS_DEBUG_static = $(CFLAGS_COMMON) -g
+CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -shared -g -D_DLL -D_STLP_USE_DYNAMIC_LIB -D_STLP_DLLEXPORT_NEEDS_PREDECLARATION
+
-+CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_STLP_DEBUG
-+CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
++CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
+
+LDLIBS_RELEASE_dynamic = ${LDLIBS_COMMON_dynamic}
+LDFLAGS_RELEASE_dynamic = ${CXXFLAGS_RELEASE_dynamic} ${LDFLAGS_COMMON_dynamic} -Wl,-Map,${OUTDIR}/${RELEASE_NAME}.map -Wl,--out-implib,${OUTDIR}/${RELEASE_NAME}.a
@@ -399,8 +399,8 @@
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g
+
-+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
+
+CFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -DSTL_OS2_BUILDING -O3 -march=pentium -mtune=pentium4
+CFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -DSTL_OS2_BUILDING -O3 -march=pentium -mtune=pentium4
@@ -408,8 +408,8 @@
+CFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
+CFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g
+
-+CFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+CFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
++CFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
+
+include common_percent_rules.mak
+include common_rules.mak
@@ -475,8 +475,8 @@
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
+
-+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
+
+CFLAGS_RELEASE_static = $(CFLAGS_COMMON) -O2 -fPIC
+CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -O2 -fPIC
@@ -484,8 +484,8 @@
+CFLAGS_DEBUG_static = $(CFLAGS_COMMON) -g -fPIC
+CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -g -fPIC
+
-+CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_STLP_DEBUG
-+CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
++CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
+
+include common_percent_rules.mak
+include common_rules.mak
diff --git a/stlport/systemstlguards/postextstl.h b/stlport/systemstlguards/postextstl.h
deleted file mode 100644
index 8ab646e..0000000
--- a/stlport/systemstlguards/postextstl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifdef std_was_redefined_as_stlport
-// put things back the way they were
-# define std std_was_redefined_as_stlport
-# undef _STLP_OUTERMOST_HEADER_ID
-// force config to be re-read
-# undef _STLP_NOTHROW_INHERENTLY
-# undef _STLP_CONFIG_H
-# include <stddef.h>
-#endif
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stlport/systemstlguards/preextstl.h b/stlport/systemstlguards/preextstl.h
deleted file mode 100644
index cc27193..0000000
--- a/stlport/systemstlguards/preextstl.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-//1. Force inclusion of a std:: using header to ensure the stlport define
-//of std as "stlport"
-#include <algorithm>
-#if defined(ADAPT_EXT_STL)
-//2. Force inclusion of stlport headers to get their stlport:: definitions
-# include <ostream>
-# include <istream>
-# include <fstream>
-# include <iostream>
-# include <sstream>
-# include <vector>
-# include <deque>
-# include <set>
-# include <list>
-# include <map>
-//3. Now force inclusion of native headers to get their std:: definitions
-# if defined(std)
-# define std_was_redefined_as_stlport std
-# undef std
-# define _STLP_OUTERMOST_HEADER_ID 0xdeadbeaf
-# if defined(_GNUC__)
-# pragma GCC visibility push(default)
-# endif
-//Do we still need to include exception_defines.h here, I'd prefer
-//to drop it if possible
-# if (__GNUC__ >= 5 || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)))
-# include _STLP_NATIVE_HEADER(bits/exception_defines.h)
-# else
-# include _STLP_NATIVE_HEADER(exception_defines.h)
-# endif
-# include _STLP_NATIVE_HEADER(limits)
-# if !defined(__GXX_EXPERIMENTAL_CXX0X__)
-# include _STLP_NATIVE_HEADER(memory)
-# endif
-# include _STLP_NATIVE_HEADER(exception)
-# include _STLP_NATIVE_HEADER(iosfwd)
-# if !defined(__GXX_EXPERIMENTAL_CXX0X__)
-# include _STLP_NATIVE_HEADER(algorithm)
-# include _STLP_NATIVE_HEADER(string)
-# else
-# include _STLP_NATIVE_HEADER(vector)
-# include _STLP_NATIVE_HEADER(string)
-# include _STLP_NATIVE_HEADER(numeric)
-# include _STLP_NATIVE_HEADER(functional)
-# include _STLP_NATIVE_HEADER(algorithm)
-# endif
-# include _STLP_NATIVE_HEADER(streambuf)
-# include _STLP_NATIVE_HEADER(ios)
-# include _STLP_NATIVE_HEADER(locale)
-# include _STLP_NATIVE_HEADER(stdexcept)
-# include _STLP_NATIVE_HEADER(ostream)
-# include _STLP_NATIVE_HEADER(istream)
-# include _STLP_NATIVE_HEADER(iostream)
-# include _STLP_NATIVE_HEADER(sstream)
-# include _STLP_NATIVE_HEADER(vector)
-# include _STLP_NATIVE_HEADER(deque)
-# include _STLP_NATIVE_HEADER(set)
-# include _STLP_NATIVE_HEADER(list)
-# include _STLP_NATIVE_HEADER(map)
-# if defined(_GNUC__)
-# pragma GCC visibility pop
-# endif
-# endif
-#endif
-//ext_std resolves to the std that external c++ libs, e.g. Graphite were built
-//against regardless of whether that is stlport or system stl
-namespace ext_std = std;
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit faa6b7db5c875d452d1f32a781001d79840b6c90
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Feb 9 10:49:18 2011 +0100
Removing the ext_std masterpiece
diff --git a/solenv/inc/os2gcci.mk b/solenv/inc/os2gcci.mk
index ec4d341..5da038c 100644
--- a/solenv/inc/os2gcci.mk
+++ b/solenv/inc/os2gcci.mk
@@ -53,7 +53,7 @@ CDEFS+=-E
.ENDIF
# _PTHREADS is needed for the stl
-CDEFS+=-DX86 -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+CDEFS+=-DX86 -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1
# this is a platform with JAVA support
.IF "$(SOLAR_JAVA)"!=""
@@ -256,9 +256,6 @@ STDLIBGUIST=$(STDLIBCPP)
STDSHLGUIMT=$(STDLIBCPP)
STDSHLCUIMT=$(STDLIBCPP)
-LIBSTLPORT=$(DYNAMIC) stlp45.lib
-LIBSTLPORTST=$(STATIC) stlp45.lib $(DYNAMIC)
-
# name of library manager
LIBMGR=ar
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 2d39af7..d8a92a6 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1215,15 +1215,6 @@ STDSHL=$(STDSHLCUIMT)
.EXPORT : PICSWITCH
-.IF "$(USE_SYSTEM_STL)"=="YES"
-LIBSTLPORT=""
-.ENDIF
-
-.IF "$(NO_DEFAULT_STL)"==""
-STDLIB+=$(LIBSTLPORT)
-STDSHL+=$(LIBSTLPORT)
-.ENDIF # "$(NO_DEFAULT_STL)"==""
-
# fill up unresolved symbols not found else where
.IF "$(FILLUPARC)"!=""
STDLIB+=$(FILLUPARC)
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index c59b3e1..b3248dc 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -29,11 +29,7 @@
# setup INCLUDE variable for use by VC++
.IF "$(GUI)$(COM)"=="WNTMSC"
-.IF "$(EXT_USE_STLPORT)"==""
-INCLUDE!:=. $(subst,/stl, $(SOLARINC))
-.ELSE # "$(EXT_USE_STLPORT)"==""
INCLUDE!:=. $(SOLARINC)
-.ENDIF # "$(EXT_USE_STLPORT)"==""
INCLUDE!:=$(INCLUDE:s/ -I/;/)
.EXPORT : INCLUDE
.ENDIF # "$(GUI)$(COM)"=="WNTMSC"
diff --git a/solenv/inc/unxbsdi.mk b/solenv/inc/unxbsdi.mk
index 5e9c066..04a05db 100644
--- a/solenv/inc/unxbsdi.mk
+++ b/solenv/inc/unxbsdi.mk
@@ -37,7 +37,7 @@ JAVAFLAGSDEBUG=-g
#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
# _PTHREADS is needed for the stl
-CDEFS+=-DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
+CDEFS+=-DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1
# this is a platform with JAVA support
.IF "$(SOLAR_JAVA)"!=""
@@ -146,14 +146,6 @@ STDLIBCUIMT=-lpthread -lm
STDSHLGUIMT=-lX11 -lXext -lpthread -lm
STDSHLCUIMT=-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
diff --git a/solenv/inc/unxbsdi2.mk b/solenv/inc/unxbsdi2.mk
index f420630..08641ad 100644
--- a/solenv/inc/unxbsdi2.mk
+++ b/solenv/inc/unxbsdi2.mk
@@ -37,8 +37,7 @@ JAVAFLAGSDEBUG=-g
#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
# _PTHREADS is needed for the stl
-CDEFS+= -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
-
+CDEFS+= -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1
# this is a platform with JAVA support
.IF "$(SOLAR_JAVA)"!=""
JAVADEF=-DSOLAR_JAVA
@@ -164,16 +163,6 @@ STDSHLCUIMT=-lpthread -lm
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlport -lstdc++
-LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-.ENDIF
-
-#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
-
# name of library manager
LIBMGR=ar
LIBFLAGS=-r
diff --git a/solenv/inc/unxbsdi3.mk b/solenv/inc/unxbsdi3.mk
index c059965..872c347 100644
--- a/solenv/inc/unxbsdi3.mk
+++ b/solenv/inc/unxbsdi3.mk
@@ -13,7 +13,7 @@ JAVAFLAGSDEBUG=-g
#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
# _PTHREADS is needed for the stl
-CDEFS+= -DX86 $(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
+CDEFS+= -DX86 $(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1
# enable visibility define in "sal/types.h"
.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
@@ -150,11 +150,6 @@ STDSHLCUIMT=-lm -lc -lgcc_s -lstdc++ -lpthread
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lgcc_s -lstdc++
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-
-#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
-
# name of library manager
LIBMGR=ar
LIBFLAGS=-r
diff --git a/solenv/inc/unxbsds.mk b/solenv/inc/unxbsds.mk
index 0811c85..6bf4739 100644
--- a/solenv/inc/unxbsds.mk
+++ b/solenv/inc/unxbsds.mk
@@ -37,7 +37,7 @@ JAVAFLAGSDEBUG=-g
#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=$(STLPORT_VER) -DOSL_USE_SYS_V_SEMAPHORE
+CDEFS+=-D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DOSL_USE_SYS_V_SEMAPHORE
# this is a platform with JAVA support
.IF "$(SOLAR_JAVA)"!=""
@@ -144,16 +144,6 @@ STDLIBCUIMT=-lpthread -lm
STDSHLGUIMT=-lX11 -lXext -lpthread -lm
STDSHLCUIMT=-lpthread -lm
-# STLport always needs pthread. This may yield some redundant -lpthread
-# but that doesn't matter.
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlport -lpthread
-LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC) -lpthread
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lpthread
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -lpthread
-.ENDIF
-
# name of library manager
LIBMGR=ar
diff --git a/solenv/inc/unxbsdx3.mk b/solenv/inc/unxbsdx3.mk
index 069aa91..986cd42 100644
--- a/solenv/inc/unxbsdx3.mk
+++ b/solenv/inc/unxbsdx3.mk
@@ -13,7 +13,7 @@ JAVAFLAGSDEBUG=-g
#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
# _PTHREADS is needed for the stl
-CDEFS+= -DX86_64 $(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
+CDEFS+= -DX86_64 $(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1
# enable visibility define in "sal/types.h"
.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
@@ -150,11 +150,6 @@ STDSHLCUIMT=-lm -lc -lgcc_s -lstdc++ -lpthread
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lgcc_s -lstdc++
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-
-#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
-
# name of library manager
LIBMGR=ar
LIBFLAGS=-r
diff --git a/solenv/inc/unxfbsd.mk b/solenv/inc/unxfbsd.mk
index 9266d5d..e22499a 100644
--- a/solenv/inc/unxfbsd.mk
+++ b/solenv/inc/unxfbsd.mk
@@ -46,7 +46,7 @@ JAVAFLAGSDEBUG=-g
#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
# _PTHREADS is needed for the stl
-CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
+CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1
# enable visibility define in "sal/types.h"
.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
@@ -187,26 +187,6 @@ STDSHLCUIMT=$(PTHREAD_LIBS) -lm
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-.IF "$(USE_STLP_DEBUG)" != ""
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlportstlg
-LIBSTLPORTST=$(STATIC) -lstlportstlg $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
-LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
-.ENDIF
-.ELSE # "$(USE_STLP_DEBUG)" != ""
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlport
-LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-.ENDIF
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-
-#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
-
# name of library manager
LIBMGR=ar
LIBFLAGS=-r
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 2261e25..4896b4f 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -44,7 +44,7 @@ JAVAFLAGSDEBUG=-g
#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=$(STLPORT_VER)
+CDEFS+=-D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1
# enable visibility define in "sal/types.h"
.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
@@ -120,13 +120,6 @@ GCCNUMVER:=$(shell @-$(CXX) $(GCCNUMVERSION_CMD))
# Compiler flags for enabling optimizations
.IF "$(PRODUCT)"!=""
CFLAGSOPT=$(CDEFAULTOPT) # optimizing for products
-.IF "$(USE_SYSTEM_STL)"!="YES" || "$(GCCNUMVER)" <= "000400050000"
-#STLPort headers are full of aliasing warnings and
-#At least SLED 10.2 gcc 4.3 overly agressively optimizes
-#uno::Sequence into junk, so only strict-alias on compiler
-#later than 4.5.1
-CFLAGSOPT+=-fno-strict-aliasing
-.ENDIF
.ELSE # "$(PRODUCT)"!=""
CFLAGSOPT= # no optimizing for non products
.ENDIF # "$(PRODUCT)"!=""
@@ -250,26 +243,6 @@ X11LINK_DYNAMIC = -Wl,--as-needed -lXext -lX11 -Wl,--no-as-needed
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-.IF "$(USE_STLP_DEBUG)" != ""
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlportstlg
-LIBSTLPORTST=$(STATIC) -lstlportstlg $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
-LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
-.ENDIF
-.ELSE # "$(USE_STLP_DEBUG)" != ""
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlport
-LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-.ENDIF
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-
-#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
-
# name of library manager
LIBMGR*=ar
LIBFLAGS=-r
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index 77a3481..17d9422 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -38,7 +38,7 @@ LINKOUTPUT_FILTER=
# Definitions that we may need on the compile line.
# -D_PTHREADS and -D_REENTRANT are needed for STLport, and must be specified when
# compiling STLport sources too, either internally or externally.
-CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFINES) -DSTLPORT_VERSION=$(STLPORT_VER) -D_USE_NAMESPACE=1
+CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFINES) -D_USE_NAMESPACE=1
.IF "$(GUIBASE)"=="unx" && "$(USE_SYSTEM_STL)"!="YES"
CDEFS+=-DX_LOCALE
.ENDIF
@@ -165,27 +165,6 @@ CDEFS+=$(EXTRA_CDEFS)
STDLIBCPP=-lstdc++
# ---------------------------------
-# STLport library names
-# ---------------------------------
-.IF "$(USE_STLP_DEBUG)" != ""
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=-lstlportstlg
-LIBSTLPORTST=$(STATIC) -lstlportstlg
-.ELSE
-LIBSTLPORT=-lstlport_gcc_stldebug
-LIBSTLPORTST=$(SOLARVERSION)/$(INPATH)/lib/libstlport_gcc_stldebug.a
-.ENDIF
-.ELSE # "$(USE_STLP_DEBUG" != ""
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=-lstlport
-LIBSTLPORTST=$(STATIC) -lstlport
-.ELSE
-LIBSTLPORT=-lstlport_gcc
-LIBSTLPORTST=$(SOLARVERSION)/$(INPATH)/lib/libstlport_gcc.a
-.ENDIF
-.ENDIF # "$(USE_STLP_DEBUG" != ""
-
-# ---------------------------------
# Link stage flags
# ---------------------------------
# always link with gcc since you may be linking c code and don't want -lstdc++ linked in!
diff --git a/solenv/inc/unxsogi.mk b/solenv/inc/unxsogi.mk
index ce82fca..06bb68e 100644
--- a/solenv/inc/unxsogi.mk
+++ b/solenv/inc/unxsogi.mk
@@ -33,7 +33,7 @@ SOLAR_JAVA=TRUE
JAVAFLAGSDEBUG=-g
# _PTHREADS is needed for the stl
-CDEFS+=-D_PTHREADS -D_REENTRANT -DSYSV -DSUN -DSUN4 -D_POSIX_PTHREAD_SEMANTICS -DSTLPORT_VERSION=$(STLPORT_VER) -D_USE_NAMESPACE=1
+CDEFS+=-D_PTHREADS -D_REENTRANT -DSYSV -DSUN -DSUN4 -D_POSIX_PTHREAD_SEMANTICS -D_USE_NAMESPACE=1
.IF "$(SOLAR_JAVA)"!=""
@@ -112,14 +112,6 @@ STDSHLCUIMT=$(DYNAMIC) -lpthread -lthread -lm
STDLIBGUIMT+=-lX11
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlport
-LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-.ENDIF
-
LIBMGR=ar
LIBFLAGS=-r
# LIBEXT=.so
diff --git a/solenv/inc/unxsogs.mk b/solenv/inc/unxsogs.mk
index dd0fb53..7136621 100644
--- a/solenv/inc/unxsogs.mk
+++ b/solenv/inc/unxsogs.mk
@@ -33,7 +33,7 @@ SOLAR_JAVA=TRUE
JAVAFLAGSDEBUG=-g
# _PTHREADS is needed for the stl
-CDEFS+=-D_PTHREADS -D_REENTRANT -DSYSV -DSUN -DSUN4 -D_POSIX_PTHREAD_SEMANTICS -DSTLPORT_VERSION=$(STLPORT_VER) -D_USE_NAMESPACE=1
+CDEFS+=-D_PTHREADS -D_REENTRANT -DSYSV -DSUN -DSUN4 -D_POSIX_PTHREAD_SEMANTICS -D_USE_NAMESPACE=1
.IF "$(SOLAR_JAVA)"!=""
@@ -111,14 +111,6 @@ STDSHLCUIMT=$(DYNAMIC) -lpthread -lthread -lm
STDLIBGUIMT+=-lX11
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlport
-LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-.ENDIF
-
LIBMGR=ar
LIBFLAGS=-r
# LIBEXT=.so
diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk
index 6d958a0..522425e 100644
--- a/solenv/inc/unxsoli4.mk
+++ b/solenv/inc/unxsoli4.mk
@@ -29,7 +29,7 @@
ASM=/usr/ccs/bin/as
AFLAGS=-P
-CDEFS+=-D_PTHREADS -DSYSV -DSUN -DSUN4 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DSTLPORT_VERSION=$(STLPORT_VER)
+CDEFS+=-D_PTHREADS -DSYSV -DSUN -DSUN4 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
SOLAR_JAVA*=TRUE
.IF "$(SOLAR_JAVA)"!=""
@@ -200,14 +200,6 @@ X11LINK_DYNAMIC = -lXext -lX11
# LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract
LIBSALCPPRT=
-.IF "$(USE_STLP_DEBUG)" != ""
-LIBSTLPORT=$(DYNAMIC) -lstlport_sunpro_debug
-LIBSTLPORTST=$(STATIC) -lstlport_sunpro_debug $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_sunpro
-LIBSTLPORTST=$(STATIC) -lstlport_sunpro $(DYNAMIC)
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-
LIBMGR=CC
LIBFLAGS=-xar -o
diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk
index 37abd3d..5918196 100644
--- a/solenv/inc/unxsols4.mk
+++ b/solenv/inc/unxsols4.mk
@@ -30,7 +30,7 @@ ASM=/usr/ccs/bin/as
# needs -D__sparcv8plus because it's not defined by the assembler with -xarch=v8plus
AFLAGS=-P -xarch=v8plus -D__sparcv8plus
-CDEFS+=-D_PTHREADS -DSYSV -DSUN -DSUN4 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DSTLPORT_VERSION=$(STLPORT_VER)
+CDEFS+=-D_PTHREADS -DSYSV -DSUN -DSUN4 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
SOLAR_JAVA*=TRUE
.IF "$(SOLAR_JAVA)"!=""
@@ -206,14 +206,6 @@ X11LINK_DYNAMIC = -lXext -lX11
# LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract
LIBSALCPPRT=
-.IF "$(USE_STLP_DEBUG)" != ""
-LIBSTLPORT=$(DYNAMIC) -lstlport_sunpro_debug
-LIBSTLPORTST=$(STATIC) -lstlport_sunpro_debug $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_sunpro
-LIBSTLPORTST=$(STATIC) -lstlport_sunpro $(DYNAMIC)
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-
LIBMGR=CC
LIBFLAGS=-xar -o
diff --git a/solenv/inc/unxsolu4.mk b/solenv/inc/unxsolu4.mk
index 406c211..b79a33e 100644
--- a/solenv/inc/unxsolu4.mk
+++ b/solenv/inc/unxsolu4.mk
@@ -55,7 +55,7 @@ CC*=cc
CFLAGS=$(PREENVCFLAGS) -c -temp=/tmp
CFLAGSCC=-xCC $(ARCH_FLAGS)
-CFLAGSCXX= -features=no%altspell -library=stlport4 $(ARCH_FLAGS)
+CFLAGSCXX= -features=no%altspell $(ARCH_FLAGS)
# flags to enable build with symbols; required for crashdump feature
CFLAGSENABLESYMBOLS=-g0 -xs # was temporarily commented out, reenabled before Beta
@@ -138,7 +138,7 @@ LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../
LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN/../../../basis-link/program'\'
LINKFLAGSRUNPATH_NONE=
-LINKFLAGS=-m64 -w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=stlport4
+LINKFLAGS=-m64 -w -mt -z combreloc -PIC -temp=/tmp -norunpath
LINKCFLAGS=-m64 -w -mt -z combreloc -norunpath
# -z text force fatal error if non PIC code is linked into shared library. Such code
@@ -199,14 +199,6 @@ STDSHLGUIMT+=-lX11 -ldl
# LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract
LIBSALCPPRT=
-.IF "$(USE_STLP_DEBUG)" != ""
-LIBSTLPORT=$(DYNAMIC) -lstlport_sunpro_debug
-LIBSTLPORTST=$(STATIC) -lstlport_sunpro_debug $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_sunpro
-LIBSTLPORTST=$(STATIC) -lstlport_sunpro $(DYNAMIC)
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-
LIBMGR=CC
LIBFLAGS=-xar -o
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
index e6d73b4..73f3399 100755
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -77,7 +77,7 @@ CFLAGSNOOPT=-O0
# Compiler flags for describing the output path
CFLAGSOUTOBJ=-o
#plattform hart setzen
-CDEFS+=-DWIN32 -DWINVER=0x500 -D_WIN32_WINNT=0x500 -D_WIN32_IE=0x500 -D_M_IX86 -DSTLPORT_VERSION=450 -D_NATIVE_WCHAR_T_DEFINED -D_MSC_EXTENSIONS -D_FORCENAMELESSUNION
+CDEFS+=-DWIN32 -DWINVER=0x500 -D_WIN32_WINNT=0x500 -D_WIN32_IE=0x500 -D_M_IX86 -D_NATIVE_WCHAR_T_DEFINED -D_MSC_EXTENSIONS -D_FORCENAMELESSUNION
.IF "$(DYNAMIC_CRT)"!=""
CDEFS+=-D_DLL
.ENDIF
@@ -163,9 +163,6 @@ STDLIBCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -l
STDSHLGUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt
STDSHLCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt
-LIBSTLPORT=-lstlport_gcc
-LIBSTLPORTST=-lstlport_gcc_static $(STDLIBCPP)
-
LIBMGR=ar
LIBFLAGS=-rsu
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index db65506..cbe7b3e 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -224,7 +224,7 @@ CFLAGSWERRCC=-WX
# settings.mk):
MODULES_WITH_WARNINGS :=
-CDEFS+=-DSTLPORT_VERSION=400 -D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500
+CDEFS+=-D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500
.IF "$(COMEX)" == "11"
_VC_MANIFEST_BASENAME=__VC80
.ELSE
@@ -340,19 +340,6 @@ STDLIBCUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.
STDSHLGUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
STDSHLCUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(USE_STLP_DEBUG)" != ""
-LIBSTLPORT=stlport_vc71_stldebug.lib
-LIBSTLPORTST=stlport_vc71_stldebug_static.lib
-.ELSE
-LIBSTLPORT=stlport_vc71.lib
-LIBSTLPORTST=stlport_vc71_static.lib
-.ENDIF
-.ELSE # "$(USE_SYSTEM_STL)"!="YES"
-LIBSTLPORT=
-LIBSTLPORTST=
-.ENDIF # "$(USE_SYSTEM_STL)"!="YES"
-
LIBMGR=lib $(NOLOGO)
IMPLIB=lib
LIBFLAGS=
commit 31a9634eb8c8b5564d1ca1499a3efd4098718163
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Feb 9 04:21:48 2011 +0100
Build STLport only as a compatibility library
diff --git a/configure.in b/configure.in
index f210dd4..a2bb2e8 100755
--- a/configure.in
+++ b/configure.in
@@ -959,17 +959,10 @@ WITH_SYSTEM_MOZILLA=no)
AC_ARG_WITH(stlport,
AS_HELP_STRING([--with-stlport],
- [The location that STLport is installed in. The STL header files are assumed
- to be in stlport-home/stlport and the STLPort library in stlport-home/lib.])
- [
- Usage: --with-stlport=<abs. path to stlport home>
-
- Warning!!, disabling using --without-stlport or
- enabling using --with-stlport on a platform that
- defaults to the opposite will break ABI compatability.
- ],
- WITH_STLPORT=$withval ,
-WITH_STLPORT=auto)
+ [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],
@@ -2538,7 +2531,7 @@ dnl ===================================================================
dnl Set the gcc/gxx include directories
dnl ===================================================================
# Removed the special FreeBSD treatment. The problem was that with_gxx_include_path
-# often contains an i386 which is expanded as a macro. Solved in stlport.
+# 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
@@ -2813,118 +2806,53 @@ fi
dnl ===================================================================
dnl Checks for what the default STL should be
dnl ===================================================================
- AC_MSG_CHECKING([what the default STL should be])
- DEFAULT_TO_STLPORT="no"
+ 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*)
- DEFAULT_TO_STLPORT="no"
+ BUILD_STLPORT="no"
;;
*)
- DEFAULT_TO_STLPORT="yes"
+ BUILD_STLPORT="yes"
;;
esac
;;
*)
- DEFAULT_TO_STLPORT="no"
+ BUILD_STLPORT="no"
;;
esac
elif test "$_os" = "SunOS"; then
- DEFAULT_TO_STLPORT="yes"
+ BUILD_STLPORT="yes"
elif test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then
- DEFAULT_TO_STLPORT="yes"
+ BUILD_STLPORT="yes"
elif test "$_os" = "OS2"; then
- DEFAULT_TO_STLPORT="yes"
+ BUILD_STLPORT="yes"
elif test "$_os" = "FreeBSD"; then
- DEFAULT_TO_STLPORT="yes"
+ BUILD_STLPORT="yes"
fi
- if test "$DEFAULT_TO_STLPORT" = "yes"; then
- AC_MSG_RESULT([stlport])
+ if test "$BUILD_STLPORT" = "yes" ; then
+ AC_MSG_RESULT([yes])
else
- AC_MSG_RESULT([system])
- fi
- if test "$WITH_STLPORT" = "auto"; then
- WITH_STLPORT=$DEFAULT_TO_STLPORT
+ AC_MSG_RESULT([no])
fi
-dnl ===================================================================
-dnl Checks for STLPORT
-dnl ===================================================================
- AC_MSG_CHECKING([for STL providing headers])
- STLPORT4=""
- USE_SYSTEM_STL=""
- if test "$WITH_STLPORT" = "yes"; then
- AC_MSG_RESULT([using internal stlport.])
- if test "$DEFAULT_TO_STLPORT" != "yes"; then
- AC_MSG_WARN([using stlport. Warning, breaks your ABI compatability!])
- echo "using stlport. Warning, breaks your ABI compatability!" >>warn
- fi
- elif test "$WITH_STLPORT" = "no"; then
- AC_MSG_RESULT([using system STL])
- USE_SYSTEM_STL="YES"
- if test "$DEFAULT_TO_STLPORT" != "no"; then
- AC_MSG_WARN([using system STL. Warning, breaks your ABI compatability!])
- echo "using system STL. Warning, breaks your ABI compatability!" >>warn
- 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+=-DWITH_STLPORT
+ BUILD_TYPE="$BUILD_TYPE STLPORT"
else
- STLPORT4=$WITH_STLPORT
- if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
- AC_TRY_CPP($STLPORT4/stlport/hash_map, AC_MSG_RESULT([checked.]), AC_MSG_ERROR([STLport headers not found.]))
- else
- dnl AC_TRY_CPP doesn't work for MSVC because C++ preprocessor is not found by autoconf.
- if test -f "$STLPORT4/stlport/hash_map"; then
- AC_MSG_RESULT([checked.])
- else
- AC_MSG_ERROR([STLport headers not found.])
- fi
- fi
- if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
- AC_MSG_CHECKING([for STLport libraries])
- if test "$_os" = "SunOS"; then
- if test -f "$STLPORT4/lib/libstlport_sunpro.so"; then
- AC_MSG_RESULT([checked])
- elif test -f "$STLPORT4/lib/libstlport.so"; then
- AC_MSG_RESULT([checked])
- STLPORT_VER=500
- else
- AC_MSG_ERROR([STLport libraries not found])
- fi
- elif test "$_os" = "Darwin"; then
- if test -f "$STLPORT4/lib/libstlport_gcc.dylib"; then
- AC_MSG_RESULT([checked])
- elif test -f "$STLPORT4/lib/libstlport.dylib"; then
- AC_MSG_RESULT([checked])
- STLPORT_VER=500
- else
- AC_MSG_ERROR([STLport libraries not found])
- fi
- else
- if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
- AC_MSG_RESULT([checked])
- elif test -f "$STLPORT4/lib/libstlport.so"; then
- AC_MSG_RESULT([checked])
- STLPORT_VER=500
- else
- AC_MSG_ERROR([STLport libraries not found])
- fi
- fi
- fi
- if test "$DEFAULT_TO_STLPORT" != "yes"; then
- AC_MSG_WARN([using stlport. Warning, breaks your ABI compatability!])
- echo "using stlport. Warning, breaks your ABI compatability!" >>warn
- fi
+ WITH_STLPORT=NO
+ AC_MSG_RESULT([no])
fi
-if test -z "$STLPORT4"; then
- STLPORT4="NO_STLPORT4"
-fi
-if test -z "$STLPORT_VER"; then
- STLPORT_VER=400
-fi
-AC_SUBST(STLPORT4)
-AC_SUBST(STLPORT_VER)
-AC_SUBST(USE_SYSTEM_STL)
+AC_SUBST(WITH_STLPORT)
dnl ===================================================================
dnl visibility and c++0x features
@@ -3036,20 +2964,9 @@ dnl ===================================================================
dnl system stl sanity tests
dnl ===================================================================
HAVE_GCC_VISIBILITY_BROKEN=
-if test \( "$_os" != "WINNT" -o "$WITH_MINGW" = "yes" \) -a "$USE_SYSTEM_STL" = "YES"; then
- AC_MSG_CHECKING([if hash_map will be in __gnu_cxx namespace])
- AC_LANG_PUSH([C++])
+if test \( "$_os" != "WINNT" -o "$WITH_MINGW" = "yes" \) ; then
- AC_TRY_COMPILE([#include <ext/hash_map>
-using namespace __gnu_cxx;
-],[hash_map<int, int> t; return 0;],
- ac_cv_cxx_have_ext_hash_map=yes, ac_cv_cxx_have_ext_hash_map=no)
-
- if test "$ac_cv_cxx_have_ext_hash_map" = "no"; then
- AC_MSG_ERROR([Can't find hash_map. Try with --with-stlport])
- else
- AC_MSG_RESULT([$ac_cv_cxx_have_ext_hash_map])
- fi
+ AC_LANG_PUSH([C++])
if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
AC_MSG_CHECKING([if STL headers are visibility safe])
@@ -4862,15 +4779,12 @@ if test -n "$with_system_mdds" -o -n "$with_system_headers" && \
dnl Determine which hash container mdds shall use
dnl ===================================================================
AC_MSG_CHECKING([which hash container mdds shall use])
- if test "x$HAVE_BOOST_UNORDERED_MAP" = "xTRUE"; then
- MDDS_CPPFLAGS="-DMDDS_HASH_CONTAINER_BOOST"
- AC_MSG_RESULT([boost::unordered_map])
- elif test "x$HAVE_CXX0X" = "xTRUE"; then
+ if test "x$HAVE_CXX0X" = "xTRUE"; then
MDDS_CPPFLAGS="-std=c++0x"
AC_MSG_RESULT([std::unordered_map])
else
- MDDS_CPPFLAGS="-DMDDS_HASH_CONTAINER_STLPORT"
- AC_MSG_RESULT([std::hash_map])
+ MDDS_CPPFLAGS="-DMDDS_HASH_CONTAINER_BOOST"
+ AC_MSG_RESULT([boost::unordered_map])
fi
AC_LANG_PUSH([C++])
diff --git a/set_soenv.in b/set_soenv.in
index 6aefd56..71f557a 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -40,7 +40,7 @@ my ( $outfile, $bootfile, $newline, $comment,
$compiler, $ds, $ps,
$wps, $cur_dir, $par_dir, $I, $L, $tmp, $MINGW,
$USE_MINGW, $platform,
- $cygwinver, $empty, $no_ant, $no_stl, $no_gcc_include,
+ $cygwinver, $empty, $no_ant, $no_gcc_include,
$no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $exportvars, $win_format_var, $perl_os, @mingw_lib_include_paths, $mingw_lib_include_path);
#
#-------------------------------------------------
@@ -71,8 +71,7 @@ my ( $BIG_SVX, $COM, $ARCH, $CPU, $CPUNAME, $CVER, $GLIBC, $GUI, $GUIBASE,
my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG, $DEFIMGS,
$USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE,
$SOLARENVINC, $USR_DT, $USR_OPENWIN, $XLIB, $XINC,
- $CYGWIN_PATH, $language, $dict, $ASM_PATH, $NSIS_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB,
- $STLPORT_stlport, $STLPORT_inc_stlport, $PERL_PATH, $CL_X64 );
+ $CYGWIN_PATH, $language, $dict, $ASM_PATH, $NSIS_PATH, $PERL_PATH, $CL_X64 );
# Environment variables.
my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
@@ -86,7 +85,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
$COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $DIRECTXSDK_LIB, $USE_NEW_SDK, $FRAME_HOME,
$USE_DIRECTX5, $ATL_LIB, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $NO_HIDS, $TMPDIR,
$COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
- $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, $MOZILLABUILD,
+ $WIN_GNUCOPY, $WIN_TOUCH, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, $MOZILLABUILD,
$PROEXT, $TARFILE_LOCATION,
$PYTHON, $SYSTEM_PYTHON, $SYSTEM_MOZILLA, $EPM_FLAGS);
#
@@ -116,10 +115,8 @@ $par_dir = ".."; # parrent directory
$I = " -I"; # include search path
$L = " -L"; # library search path
$empty = ""; # used as argument
-$no_stl = "NO_STLPORT4"; # possible argument
$warnfile = "warn"; # logfile configure warnings.
$Warning = ""; # container for warning messages
-$STLPORT4 = '@STLPORT4@'; # Location of STLport4
$SYSTEM_PYTHON = '@SYSTEM_PYTHON@';
if ($SYSTEM_PYTHON eq "NO") {
$PYTHON = "python";
@@ -869,11 +866,6 @@ if ( $platform =~ m/cygwin|os2/ ) {
# 3. bash path.
$OOO_SHELL = '@BASH@';
-if ( '@STLPORT4@' eq $no_stl )
-{
- $STLPORT4 = "$no_stl";
-}
-
# ml.exe assembler path for Windows users.
if ($platform =~ m/cygwin/)
{ $ASM_PATH = PathFormat('@ASM_HOME@');
@@ -947,19 +939,6 @@ $USR_OPENWIN = $USR.$ds."openwin";
$USR_DT = $USR.$ds."dt";
$COMMON_BUILD_TOOLS = '$SRC_ROOT'.$ds."external".$ds."common";
-if ($STLPORT4 ne $no_stl) {
- $ps_STLPORT_LIB = $ps.'$STLPORT4'.$LIB64;
- $L_STLPORT_LIB = $L.'$STLPORT4'.$LIB64;
- $STLPORT_stlport = $I.'$STLPORT4'.$ds.'stlport';
- $STLPORT_inc_stlport = $I.'$STLPORT4'.$ds.'include'.$ds.'stlport';
-} else {
- $ps_STLPORT_LIB = "";
- $L_STLPORT_LIB = "";
- $STLPORT_stlport = $I.$SRC_ROOT.$SOLVER.$ds.$UPD.$ds.$INPATH.$INC.$ds."stl";
- $STLPORT_inc_stlport = "";
-}
-
-
# Windows NT only variables
if ($platform =~ m/cygwin/)
{
@@ -1092,10 +1071,6 @@ if ($platform =~ m/cygwin|os2/)
$ILIB = $cur_dir;
- if ($STLPORT4 ne $no_stl) {
- $ILIB .= $wps.$STLPORT4.$LIB64;
- }
-
# Mingw is different
if ( $COM eq "MSC" )
{ $ILIB .= $wps.$SOLARVER.$ds.$INPATH.$LIB;
@@ -1249,7 +1224,6 @@ elsif ($platform =~ m/cygwin/)
if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
$PATH .= $ps.$tmppath;
}
- $PATH .= $ps_STLPORT_LIB;
# nsis path for Windows users.
$NSIS_PATH = PathFormat('@NSIS_PATH@');
$tmppath = CygFormat($NSIS_PATH);
@@ -1361,7 +1335,6 @@ if ($platform =~ m/solaris/)
$L.$JRELIBDIR.
$L.$JRETOOLKITDIR.
$L.$JRETHREADDIR.
- $L_STLPORT_LIB.
$L.$XLIB;
}
elsif ($platform =~ m/linux|netbsd|osf1|aix|freebsd|openbsd/)
@@ -1375,8 +1348,7 @@ elsif ($platform =~ m/linux|netbsd|osf1|aix|freebsd|openbsd/)
$SOLARLIB .= $L.'$JAVA_HOME'.$LIB64.
$L.$JRELIBDIR.
$L.$JRETOOLKITDIR.
- $L.$JRETHREADDIR.
- $L_STLPORT_LIB;
+ $L.$JRETHREADDIR;
if ( $XLIB ne "/usr/lib" && $XLIB ne "/usr/lib64" ) {
$SOLARLIB .= $L.$XLIB;
@@ -1385,12 +1357,10 @@ elsif ($platform =~ m/linux|netbsd|osf1|aix|freebsd|openbsd/)
elsif ($platform =~ m/cygwin|os2/)
{ $SOLARLIB = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
$L.$par_dir.$LIB.
- $L_STLPORT_LIB.
$L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB;
}
elsif ($platform =~ m/darwin/)
{ $SOLARLIB = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
- $L_STLPORT_LIB.
$L.$USR_LIB;
# [ed] 6/15/02 Add in X11 libraries onto the library path
if ($GUIBASE eq "unx") {
@@ -1415,12 +1385,6 @@ $SOLARINC = $I.$cur_dir.
if ($platform =~ m/solaris|linux|osf1|freebsd|netbsd|aix|openbsd/)
{
-$SOLARINC .= $STLPORT_stlport;
-if ($platform =~ m/linux|freebsd|netbsd|openbsd/)
-{
-# This simply adds an include path, so even cases that break the FHS work
-$SOLARINC .= $STLPORT_inc_stlport;
-}
if ($platform =~ m/solaris/ && ! $CC =~ "gcc")
{
$SOLARINC .= '/SC5 ';
@@ -1430,12 +1394,6 @@ if ($platform =~ m/solaris/)
{
$SOLARINC .= $I.$COMPATH.$INCLUDE;
}
-if ($platform =~ m/linux/)
-{
-# This simply adds an include path, so even cases that break the FHS work
- $SOLARINC .= $STLPORT_inc_stlport;
-}
-
$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31";
@@ -1486,8 +1444,7 @@ if ($platform =~ m/linux/)
}
}
elsif ($platform =~ m/cygwin/)
-{ $SOLARINC .= $STLPORT_stlport;
- if ($JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME")
+{ if ($JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME")
{ $SOLARINC .= $I.'$JAVA_HOME'.$INCLUDE.$ds."win32".
$I.'$JAVA_HOME'.$INCLUDE;
}
@@ -1524,8 +1481,7 @@ elsif ($platform =~ m/cygwin/)
}
}
elsif ($platform =~ m/darwin/)
-{ $SOLARINC .= $STLPORT_stlport.
- $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Versions".$ds."Current".$ds."Headers".
+{ $SOLARINC .= $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Versions".$ds."Current".$ds."Headers".
$I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers";
# [ed] 6/15/02 Add in X11 headers as appropriate for the build
if ($GUIBASE eq "unx") {
@@ -1573,8 +1529,6 @@ ToFile( "ANT_HOME", PathFormat("@ANT_HOME@"), "e" );
ToFile( "ANT_LIB", PathFormat("@ANT_LIB@"), "e" );
ToFile( "ANT", PathFormat("@ANT@"), "e" );
ToFile( "JDKLIB", $JAVA_LIB, "e" );
-ToFile( "STLPORT4", $STLPORT4, "e" );
-ToFile( "STLPORT_VER", "@STLPORT_VER@", "e" );
ToFile( "ASM_PATH", $ASM_PATH, "e" );
ToFile( "BUILD_SOSL", $BUILD_SOSL, "e" );
ToFile( "FRAMEWORKSHOME", $FRAMEWORKSHOME, "e" );
@@ -1842,7 +1796,7 @@ ToFile( "CXX", $CXX, "e" );
ToFile( "USE_CCACHE", "@USE_CCACHE@", "e" );
ToFile( "MINGWCXX", "@MINGWCXX@", "e" );
ToFile( "MINGWSTRIP", "@MINGWSTRIP@", "e" );
-ToFile( "USE_SYSTEM_STL", "@USE_SYSTEM_STL@", "e" );
+ToFile( "WITH_STLPORT", "@WITH_STLPORT@", "e" );
ToFile( "ALLOC", "@ALLOC@", "e" );
ToFile( "ENABLE_SYMBOLS", "@ENABLE_SYMBOLS@", "e" );
ToFile( "DISABLE_STRIP", "@DISABLE_STRIP@", "e" );
diff --git a/stlport/makefile.mk b/stlport/makefile.mk
index fa1de94..04ab66a 100644
--- a/stlport/makefile.mk
+++ b/stlport/makefile.mk
@@ -34,12 +34,12 @@ TARGET=so_stlport
.INCLUDE : settings.mk
-.IF "$(USE_SYSTEM_STL)"=="YES"
+.IF "$(WITH_STLPORT)"!="YES"
all:
@echo "Nothing to do"
-.ELSE # "$(USE_SYSTEM_STL)"
+.ELSE # "$(WITH_STLPORT)"!="YES"
# --- Files --------------------------------------------------------
.EXPORT : CC CXX
@@ -188,16 +188,6 @@ OUT2LIB= \
# --- Targets ------------------------------------------------------
-.IF "$(STLPORT4)"!="NO_STLPORT4"
-all :
- @echo " An already available installation of STLport has been chosen in the configure process."
- @echo " Therefore the version provided here does not need to be built in addition."
-.ELIF "$(OS)"=="MACOSX"
-all:
- @echo '--with-stlport=yes is not supported on Mac OS X'
- false
-.ENDIF
-
.INCLUDE : set_ext.mk
.INCLUDE : target.mk
.INCLUDE : tg_ext.mk
@@ -229,4 +219,4 @@ $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/win32_sdk_patch
.ENDIF "$(COM)"=="GCC"
.ENDIF # "$(GUI)"=="WNT"
-.ENDIF # "$(USE_SYSTEM_STL)"
+.ENDIF # "$(WITH_STLPORT)"!="YES"
diff --git a/stlport/prj/d.lst b/stlport/prj/d.lst
index 29848a6..fe7c6f3 100644
--- a/stlport/prj/d.lst
+++ b/stlport/prj/d.lst
@@ -1,25 +1,3 @@
-mkdir: %_DEST%\inc%_EXT%\stl
-mkdir: %_DEST%\inc%_EXT%\stl\stl
-mkdir: %_DEST%\inc%_EXT%\stl\stl\debug
-mkdir: %_DEST%\inc%_EXT%\stl\stl\wrappers
-mkdir: %_DEST%\inc%_EXT%\stl\config
-mkdir: %_DEST%\inc%_EXT%\stl\using
-mkdir: %_DEST%\inc%_EXT%\stl\using\h
-mkdir: %_DEST%\inc%_EXT%\stl\wrap_std
-mkdir: %_DEST%\inc%_EXT%\stl\wrap_std\h
-..\%__SRC%\inc\*.SUNWCCH %_DEST%\inc%_EXT%\stl\*
-..\%__SRC%\inc\stlport\* %_DEST%\inc%_EXT%\stl\*
-..\%__SRC%\inc\stlport\stl\* %_DEST%\inc%_EXT%\stl\stl\*
-..\%__SRC%\inc\stlport\stl\debug\* %_DEST%\inc%_EXT%\stl\stl\debug\*
-..\%__SRC%\inc\stlport\stl\wrappers\* %_DEST%\inc%_EXT%\stl\stl\wrappers\*
-..\%__SRC%\inc\stlport\config\* %_DEST%\inc%_EXT%\stl\config\*
-..\%__SRC%\inc\stlport\using\* %_DEST%\inc%_EXT%\stl\using\*
-..\%__SRC%\inc\stlport\using\h\* %_DEST%\inc%_EXT%\stl\using\h\*
-..\%__SRC%\inc\stlport\wrap_std\* %_DEST%\inc%_EXT%\stl\wrap_std\*
-..\%__SRC%\inc\stlport\wrap_std\h\* %_DEST%\inc%_EXT%\stl\wrap_std\h\*
-..\systemstlguards\*.h %_DEST%\inc%_EXT%\stl\*.h
..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
-..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
More information about the Libreoffice-commits
mailing list