Author: hdu
Date: Fri Aug 9 11:04:50 2013
New Revision: 1512251
URL: http://svn.apache.org/r1512251
Log:
#i122362# always enable --without-stlport configure option
The option is still left there for a while but any value
other than --without-stlport or --with-stlport=no are
rejected.
This change also cleans up stlport checks that have become
obsoleted by the change above.
Modified:
openoffice/branches/rejuvenate01/main/RepositoryFixes.mk
openoffice/branches/rejuvenate01/main/basebmp/test/makefile.mk
openoffice/branches/rejuvenate01/main/basegfx/source/workbench/Makefile
openoffice/branches/rejuvenate01/main/basegfx/test/makefile.mk
openoffice/branches/rejuvenate01/main/configure.in
openoffice/branches/rejuvenate01/main/set_soenv.in
openoffice/branches/rejuvenate01/main/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
openoffice/branches/rejuvenate01/main/solenv/gbuild/gbuild.mk
Modified: openoffice/branches/rejuvenate01/main/RepositoryFixes.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/RepositoryFixes.mk?rev=1512251&r1=1512250&r2=1512251&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/RepositoryFixes.mk (original)
+++ openoffice/branches/rejuvenate01/main/RepositoryFixes.mk Fri Aug 9
11:04:50 2013
@@ -34,10 +34,8 @@ gb_Library_FILENAMES := $(patsubst salhe
gb_Library_FILENAMES := $(patsubst
salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
-ifeq ($(USE_SYSTEM_STL),YES)
gb_Library_FILENAMES := $(patsubst
stl:%,stl:libstdc++.so,$(gb_Library_FILENAMES))
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
-endif
endif
@@ -49,14 +47,12 @@ gb_Library_FILENAMES := $(patsubst jvmfw
gb_Library_FILENAMES := $(patsubst
salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
-ifeq ($(USE_SYSTEM_STL),YES)
ifneq ($(MACOSX_DEPLOYMENT_TARGET),10.4) # default to use libc++
gb_Library_FILENAMES := $(patsubst
stl:%,stl:libc++.dylib,$(gb_Library_FILENAMES))
else # use libstdc++ instead on ancient MacOSX targets
gb_Library_FILENAMES := $(patsubst
stl:%,stl:libstdc++.dylib,$(gb_Library_FILENAMES))
endif
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
-endif
endif
@@ -79,15 +75,7 @@ gb_Library_FILENAMES := $(patsubst xslt:
gb_Library_FILENAMES := $(patsubst
rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
-ifeq ($(USE_SYSTEM_STL),YES)
gb_Library_FILENAMES := $(patsubst
stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES))
-else
-ifeq ($(gb_PRODUCT),$(true))
-gb_Library_FILENAMES := $(patsubst
stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
-else
-gb_Library_FILENAMES := $(patsubst
stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Library_FILENAMES))
-endif
-endif
gb_Library_NOILIBFILENAMES:=\
icule \
@@ -112,10 +100,8 @@ gb_Library_DLLFILENAMES := $(patsubst jv
gb_Library_DLLFILENAMES := $(patsubst
ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
-ifeq ($(USE_SYSTEM_STL),YES)
gb_Library_FILENAMES := $(patsubst
stl:%,stl:$(gb_Library_IARCSYSPRE)stdc++_s$(gb_Library_IARCSYSPRE),$(gb_Library_FILENAMES))
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
-endif
else
gb_Library_FILENAMES := $(patsubst
comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
@@ -135,15 +121,7 @@ gb_Library_FILENAMES := $(patsubst rdf:i
gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
gb_StaticLibrary_FILENAMES := $(patsubst
graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
-ifeq ($(USE_SYSTEM_STL),YES)
gb_Library_FILENAMES := $(patsubst
stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES))
-else
-ifeq ($(gb_PRODUCT),$(true))
-gb_Library_FILENAMES := $(patsubst
stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
-else
-gb_Library_FILENAMES := $(patsubst
stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Library_FILENAMES))
-endif
-endif
gb_Library_NOILIBFILENAMES:=\
advapi32 \
@@ -252,18 +230,14 @@ gb_Library_FILENAMES := $(patsubst salhe
gb_Library_FILENAMES := $(patsubst
salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
-ifeq ($(USE_SYSTEM_STL),YES)
gb_Library_FILENAMES := $(patsubst
stl:%,stl:libstdc++.so,$(gb_Library_FILENAMES))
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
-endif
endif
# we do not require a known rule for these, when using system libs
-ifeq ($(USE_SYSTEM_STL),YES)
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
-endif
ifeq ($(SYSTEM_LIBXML),YES)
gb_Library_TARGETS := $(filter-out xml2,$(gb_Library_TARGETS))
Modified: openoffice/branches/rejuvenate01/main/basebmp/test/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/basebmp/test/makefile.mk?rev=1512251&r1=1512250&r2=1512251&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/basebmp/test/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/basebmp/test/makefile.mk Fri Aug 9
11:04:50 2013
@@ -63,13 +63,6 @@ CDEFS+=-xalias_level=compatible
.ENDIF
.ENDIF
-#building with stlport, but cppunit was not built with stlport
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGSCXX+=-DADAPT_EXT_STL
-.ENDIF
-.ENDIF
-
CFLAGSCXX += $(CPPUNIT_CFLAGS)
# --- Common ----------------------------------------------------------
Modified:
openoffice/branches/rejuvenate01/main/basegfx/source/workbench/Makefile
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/basegfx/source/workbench/Makefile?rev=1512251&r1=1512250&r2=1512251&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/basegfx/source/workbench/Makefile
(original)
+++ openoffice/branches/rejuvenate01/main/basegfx/source/workbench/Makefile Fri
Aug 9 11:04:50 2013
@@ -63,7 +63,7 @@
#test : bezierclip.cxx convexhull.cxx
# g++ -Wall -g \
# -I. -I. -I../inc -I./inc -I./unx/inc -I./unxlngi4/inc -I.
-I/develop4/update/SRX644/unxlngi4/inc.m4/stl
-I/develop4/update/SRX644/unxlngi4/inc.m4/external
-I/develop4/update/SRX644/unxlngi4/inc.m4
-I/develop4/update/SRX644/src.m4/solenv/unxlngi4/inc
-I/net/grande/develop6/update/dev/gcc_3.0.1_linux_libc2.11_turbolinux/include
-I/develop4/update/SRX644/src.m4/solenv/inc
-I/develop4/update/SRX644/unxlngi4/inc.m4/stl
-I/net/grande.germany/develop6/update/dev/gcc_3.0.1_linux_libc2.11_turbolinux/redhat60/usr/include
-I/net/grande.germany/develop6/update/dev/gcc_3.0.1_linux_libc2.11_turbolinux/redhat60/usr/include/X11
-I/develop4/update/SRX644/src.m4/res
-I/net/grande/develop6/update/dev/Linux_JDK_1.4.0/include
-I/net/grande/develop6/update/dev/Linux_JDK_1.4.0/include/linux -I. -I./res -I.
\
-# -include preinclude.h -D_USE_NAMESPACE -DGLIBC=2 -D_USE_NAMESPACE=1
-DSTLPORT_VERSION=400 -D_STLP_DEBUG \
+# -include preinclude.h -D_USE_NAMESPACE -DGLIBC=2 -D_USE_NAMESPACE=1
-D_STLP_DEBUG \
# bezierclip.cxx convexhull.cxx -o bezierclip
prog : bezierclip.cxx convexhull.cxx
Modified: openoffice/branches/rejuvenate01/main/basegfx/test/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/basegfx/test/makefile.mk?rev=1512251&r1=1512250&r2=1512251&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/basegfx/test/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/basegfx/test/makefile.mk Fri Aug 9
11:04:50 2013
@@ -37,13 +37,6 @@ ENABLE_EXCEPTIONS=TRUE
@all:
@echo "cppunit disabled. nothing do do."
-.ELSE # "$(WITH_CPPUNIT)" != "YES"
-
-#building with stlport, but cppunit was not built with stlport
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGSCXX+=-DADAPT_EXT_STL
-.ENDIF
.ENDIF
CFLAGSCXX += $(CPPUNIT_CFLAGS)
Modified: openoffice/branches/rejuvenate01/main/configure.in
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/configure.in?rev=1512251&r1=1512250&r2=1512251&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/configure.in (original)
+++ openoffice/branches/rejuvenate01/main/configure.in Fri Aug 9 11:04:50 2013
@@ -673,17 +673,8 @@ AC_ARG_WITH(system-redland,
[ --with-system-redland Use redland library already on system
],,)
AC_ARG_WITH(stlport,
-[ --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=<absolute 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 compatibility
-], WITH_STLPORT=$withval , WITH_STLPORT=auto)
+[ --with-stlport Only building --without-stlport is supported.
+], WITH_STLPORT=$withval , WITH_STLPORT=NO)
AC_ARG_WITH(jdk-home,
[ --with-jdk-home if you have installed JDK 1.3 or later on your
system
please supply the path here.
@@ -2449,7 +2440,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
@@ -2736,115 +2727,12 @@ dnl Checks for what the default STL shou
dnl ===================================================================
AC_MSG_CHECKING([what the default STL should be])
DEFAULT_TO_STLPORT="no"
- if test "$_os" = "Linux"; then
- case "$build_cpu" in
- i?86)
- case "$build_os" in k*bsd*-gnu*)
- DEFAULT_TO_STLPORT="no"
- ;;
- *)
- DEFAULT_TO_STLPORT="yes"
- ;;
- esac
- ;;
- *)
- DEFAULT_TO_STLPORT="no"
- ;;
- esac
- elif test "$_os" = "SunOS"; then
- DEFAULT_TO_STLPORT="yes"
- elif test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
- DEFAULT_TO_STLPORT="yes"
- elif test "$_os" = "OS2"; then
- DEFAULT_TO_STLPORT="yes"
- elif test "$_os" = "FreeBSD"; then
- DEFAULT_TO_STLPORT="yes"
- fi
- if test "$DEFAULT_TO_STLPORT" = "yes"; then
- AC_MSG_RESULT([stlport])
- else
- AC_MSG_RESULT([system])
- fi
- if test "$WITH_STLPORT" = "auto"; then
- WITH_STLPORT=$DEFAULT_TO_STLPORT
- 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 compatibility!])
- echo "using stlport. Warning: breaks your ABI compatibility!" >>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
compatibility!])
- echo "using system STL. Warning: breaks your ABI compatibility!"
>>warn
- fi
- else
- STLPORT4=$WITH_STLPORT
- if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "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_MINGWIN" = "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 compatibility!])
- echo "using stlport. Warning: breaks your ABI compatibility!" >>warn
- fi
- fi
-
-if test -z "$STLPORT4"; then
- STLPORT4="NO_STLPORT4"
-fi
-if test -z "$STLPORT_VER"; then
- STLPORT_VER=400
+if test "$WITH_STLPORT" != "no"; then
+ AC_MSG_ERROR([Option --with-stlport is no longer available.])
+else
+ USE_SYSTEM_STL="YES"
fi
-AC_SUBST(STLPORT4)
-AC_SUBST(STLPORT_VER)
+
AC_SUBST(USE_SYSTEM_STL)
dnl ===================================================================
Modified: openoffice/branches/rejuvenate01/main/set_soenv.in
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/set_soenv.in?rev=1512251&r1=1512250&r2=1512251&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/set_soenv.in (original)
+++ openoffice/branches/rejuvenate01/main/set_soenv.in Fri Aug 9 11:04:50 2013
@@ -94,8 +94,7 @@ my ( $BIG_SVX, $COM, $ARCH, $CPU, $CPUNA
my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL,
$SOLENV, $SOLVER, $CONFIG,
$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 );
+ $CYGWIN_PATH, $language, $dict, $ASM_PATH, $NSIS_PATH, $PERL_PATH );
# Environment variables.
my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
@@ -109,7 +108,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAV
$COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $DIRECTXSDK_LIB, $USE_NEW_SDK,
$FRAME_HOME,
$USE_DIRECTX5, $ATL_LIB, $ATL_LIB_X64, $HAVE_ATLTHUNK, $ATL_INCLUDE,
$MFC_LIB, $MFC_INCLUDE, $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,
$ENABLE_HUNSPELL, $ENABLE_HYPHEN,
$SYSTEM_PYTHON, $SYSTEM_MOZILLA, $EPM_FLAGS);
@@ -145,10 +144,8 @@ $I = " -I"; # in
$L = " -L"; # library search path
$D = " -D"; # define 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@';
$SYSTEM_MOZILLA = '@SYSTEM_MOZILLA@';
$JDK = '@JDK@';
@@ -872,11 +869,6 @@ else
$OOO_SHELL = '@SHELLPATH@'."\/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@');
@@ -958,19 +950,6 @@ if ($GUI eq "OS2")
$outfile_bat =~ s/set$/cmd/i;
}
-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."/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/c++/v1/";
- $STLPORT_inc_stlport = "";
-}
-
-
# Windows NT only variables
if ($platform =~ m/cygwin/)
{
@@ -1102,10 +1081,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.
@@ -1260,7 +1235,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);
@@ -1375,7 +1349,6 @@ if ($platform =~ m/solaris/)
$L.$JRELIBDIR.
$L.$JRETOOLKITDIR.
$L.$JRETHREADDIR.
- $L_STLPORT_LIB.
$L.$XLIB;
}
elsif ($platform =~ m/linux|netbasd|osf1|aix|freebsd/)
@@ -1387,18 +1360,15 @@ elsif ($platform =~ m/linux|netbasd|osf1
$L.$JRELIBDIR.
$L.$JRETOOLKITDIR.
$L.$JRETHREADDIR.
- $L_STLPORT_LIB.
$L.$XLIB;
}
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") {
@@ -1423,11 +1393,9 @@ $SOLARINC = $I.$cur_dir.
if ($platform =~ m/solaris|linux|osf1|freebsd|netbsd/)
{
-$SOLARINC .= $STLPORT_stlport;
if ($platform =~ m/linux|freebsd|netbsd/)
{
# This simply adds an include path, so even cases that break the FHS work
-$SOLARINC .= $STLPORT_inc_stlport;
}
if ($platform =~ m/solaris/ && ! $CC =~ "gcc")
{
@@ -1441,7 +1409,6 @@ if ($platform =~ m/solaris/)
if ($platform =~ m/linux/)
{
# This simply adds an include path, so even cases that break the FHS work
- $SOLARINC .= $STLPORT_inc_stlport;
}
@@ -1481,8 +1448,7 @@ if ($platform =~ m/linux/)
}
}
elsif ($platform =~ m/cygwin/)
-{ $SOLARINC .= $STLPORT_stlport.
- $I.'$JAVA_HOME'.$ds."include".$ds."win32".
+{ $SOLARINC .= $I.'$JAVA_HOME'.$ds."include".$ds."win32".
$I.'$JAVA_HOME'.$ds."include";
# Mingw is different
if ( $COM eq "MSC" )
@@ -1522,8 +1488,9 @@ elsif ($platform =~ m/cygwin/)
}
}
elsif ($platform =~ m/darwin/)
-{ $SOLARINC .= $STLPORT_stlport.
- $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers";
+{
+ my $STLINC .=
$I."/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/c++/v1/";
+ $SOLARINC .= $STLINC .
$I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers";
}
else
{ AddWarning( "set_soenv", "$platform not configured for system dependant
include dir" );
@@ -1589,8 +1556,6 @@ ToFile( "ANT_HOME", PathFormat(
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" );
Modified:
openoffice/branches/rejuvenate01/main/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/doc/gbuild/solenv/gbuild/gbuild.mk?rev=1512251&r1=1512250&r2=1512251&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
(original)
+++
openoffice/branches/rejuvenate01/main/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
Fri Aug 9 11:04:50 2013
@@ -43,7 +43,6 @@ static const Path UPD;
static const String CVER;
static const String LIBXML_CFLAGS;
static const String OS;
-static const String STLPORT_VER;
static const Bool DEBUG;
static const Bool PRODUCT;
Modified: openoffice/branches/rejuvenate01/main/solenv/gbuild/gbuild.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/gbuild/gbuild.mk?rev=1512251&r1=1512250&r2=1512251&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/gbuild/gbuild.mk (original)
+++ openoffice/branches/rejuvenate01/main/solenv/gbuild/gbuild.mk Fri Aug 9
11:04:50 2013
@@ -162,11 +162,6 @@ gb_GLOBALDEFS := \
$(gb_COMPILERDEFS) \
$(gb_CPUDEFS) \
-ifneq ($(USE_SYSTEM_STL),YES)
-gb_GLOBALDEFS += \
- -DSTLPORT_VERSION=$(STLPORT_VER)
-endif
-
ifeq ($(gb_PRODUCT),$(true))
gb_GLOBALDEFS += \
-DPRODUCT \
