Author: truckman
Date: Fri Jan 5 20:47:25 2018
New Revision: 1820351
URL: http://svn.apache.org/viewvc?rev=1820351&view=rev
Log:
Nothing uses GXX_INCLUDE_PATH, so remove it. The uretest/README
file mentions is being needed by the STLport included in the URE,
but that does not appear to be true any longer, and it is not
used by boost.
Modified:
openoffice/trunk/main/configure.ac
openoffice/trunk/main/odk/setsdkenv_unix.sh.in
openoffice/trunk/main/odk/settings/settings.mk
openoffice/trunk/main/set_soenv.in
openoffice/trunk/main/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
openoffice/trunk/main/solenv/gbuild/gbuild.mk
openoffice/trunk/main/solenv/gbuild/platform/freebsd.mk
openoffice/trunk/main/solenv/gbuild/platform/linux.mk
openoffice/trunk/main/solenv/gbuild/platform/macosx.mk
openoffice/trunk/main/solenv/gbuild/platform/os2.mk
openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk
openoffice/trunk/main/solenv/inc/settings.mk
openoffice/trunk/main/ure/source/uretest/Makefile.pln
openoffice/trunk/main/ure/source/uretest/README
Modified: openoffice/trunk/main/configure.ac
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/configure.ac?rev=1820351&r1=1820350&r2=1820351&view=diff
==============================================================================
--- openoffice/trunk/main/configure.ac (original)
+++ openoffice/trunk/main/configure.ac Fri Jan 5 20:47:25 2018
@@ -643,12 +643,6 @@ AC_ARG_WITH(jdk-home,
Usage: --with-jdk-home=<absolute path to JDK home>
],,)
-AC_ARG_WITH(gxx_include_path,
-[ --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(java,
[ --with-java Build with[[out]] Java support. If you use
--without-java/--with-java=no then the build will
have
@@ -2450,39 +2444,6 @@ main (void)
fi
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.
-if test "$GXX" = "yes" -a "$_os" != "Darwin"; 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++ - |
$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 test "$WITH_MINGWIN" = "yes"; then
- with_gxx_include_path=`cygpath -d "$with_gxx_include_path"`
- with_gxx_include_path=`cygpath -u "$with_gxx_include_path"`
- fi
- if echo $with_gxx_include_path | $GREP -q linux; then
- # workaround for Mandriva - issue 100049
- with_gxx_include_path=`cd $with_gxx_include_path && pwd`
- fi
- 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([no g++ includes])
-else
- AC_MSG_RESULT([$with_gxx_include_path])
-fi
-GXX_INCLUDE_PATH="$with_gxx_include_path"
-AC_SUBST(GXX_INCLUDE_PATH)
-
-dnl ===================================================================
dnl Set the mingw runtime library include directories
dnl ===================================================================
if test "$WITH_MINGWIN" = "yes"; then
Modified: openoffice/trunk/main/odk/setsdkenv_unix.sh.in
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/odk/setsdkenv_unix.sh.in?rev=1820351&r1=1820350&r2=1820351&view=diff
==============================================================================
--- openoffice/trunk/main/odk/setsdkenv_unix.sh.in (original)
+++ openoffice/trunk/main/odk/setsdkenv_unix.sh.in Fri Jan 5 20:47:25 2018
@@ -159,12 +159,6 @@ case ${sdk_platform} in
;;
darwin*)
- if [ -n "$OO_SDK_CPP_HOME" ]
- then
- SDK_GXX_INCLUDE_PATH=`echo "#include <cstring>" |
${OO_SDK_CPP_HOME}/clang++ -E -xc++ - | sed -n
'/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
- export SDK_GXX_INCLUDE_PATH
- fi
-
directoryname=macosx
comid=s5abi
soext=dylib
@@ -176,12 +170,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
soext=so
@@ -193,12 +181,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
soext=so
Modified: openoffice/trunk/main/odk/settings/settings.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/odk/settings/settings.mk?rev=1820351&r1=1820350&r2=1820351&view=diff
==============================================================================
--- openoffice/trunk/main/odk/settings/settings.mk (original)
+++ openoffice/trunk/main/odk/settings/settings.mk Fri Jan 5 20:47:25 2018
@@ -345,8 +345,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
STL_INCLUDES=-I"$(OO_SDK_HOME)/include/stl"
-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
# define for used compiler necessary for UNO
#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95
@@ -464,8 +464,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
STL_INCLUDES=-I"$(OO_SDK_HOME)/include/stl"
-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
@@ -585,8 +585,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
STL_INCLUDES=-I"$(OO_SDK_HOME)/include/stl"
-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
Modified: openoffice/trunk/main/set_soenv.in
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/set_soenv.in?rev=1820351&r1=1820350&r2=1820351&view=diff
==============================================================================
--- openoffice/trunk/main/set_soenv.in (original)
+++ openoffice/trunk/main/set_soenv.in Fri Jan 5 20:47:25 2018
@@ -57,8 +57,8 @@ my ( $outfile, $outfile_sh, $outfile_bat
$compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps,
$wps, $cur_dir, $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $MINGW,
$USE_MINGW, $platform,
- $cygwinver, $empty, $no_ant, $no_stl, $no_gcc_include,
- $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $unsetvarssh,
$unsetvarsbat, $exportvars, $win_format_var, $perl_os,
@mingw_lib_include_paths, $mingw_lib_include_path);
+ $cygwinver, $empty, $no_ant, $no_stl,
+ $warnfile, $Warning, $result, $unsetvars, $unsetvarssh, $unsetvarsbat,
$exportvars, $win_format_var, $perl_os, @mingw_lib_include_paths,
$mingw_lib_include_path);
#
#-------------------------------------------------
# IIb. Declaring environment values (constants).
@@ -1472,8 +1472,7 @@ elsif ($platform =~ m/cygwin/)
$SOLARINC .= $I.PathFormat($mingw_lib_include_path);
}
}
- $SOLARINC .=
$I.PathFormat("@GXX_INCLUDE_PATH@").$I.PathFormat("@GXX_INCLUDE_PATH@".$ds."mingw32").
- $I.'$PSDK_HOME'.$INCLUDE;
+ $SOLARINC .= $I.'$PSDK_HOME'.$INCLUDE;
}
if ( '@ENABLE_DIRECTX@' ne "" ) {
$SOLARINC .= $I.PathFormat('@DIRECTXSDK_HOME@').$INCLUDE;
@@ -2000,7 +1999,6 @@ ToFile( "NEW_SHADOW_API", "@NEW_SHADO
ToFile( "PAM_LINK", "@PAM_LINK@", "e" );
ToFile( "CRYPT_LINK", "@CRYPT_LINK@", "e" );
ToFile( "XAU_LIBS", "@XAU_LIBS@", "e" );
-ToFile( "GXX_INCLUDE_PATH", PathFormat("@GXX_INCLUDE_PATH@"), "e" );
ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" );
if ($platform !~ m/cygwin|os2/) {
if ( !defined $ENV{"TMPDIR"} || $ENV{"TMPDIR"} eq "" ) {
Modified: openoffice/trunk/main/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/doc/gbuild/solenv/gbuild/gbuild.mk?rev=1820351&r1=1820350&r2=1820351&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/doc/gbuild/solenv/gbuild/gbuild.mk (original)
+++ openoffice/trunk/main/solenv/doc/gbuild/solenv/gbuild/gbuild.mk Fri Jan 5
20:47:25 2018
@@ -91,7 +91,6 @@ namespace gb
static const Path SDKDIR;
};
-// GXX_INCLUDE_PATH (Linux)
// PTHREAD_CFLAGS (Linux)
// SYSTEM_ICU (Linux)
// SYSTEM_JPEG (Linux)
Modified: openoffice/trunk/main/solenv/gbuild/gbuild.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/gbuild.mk?rev=1820351&r1=1820350&r2=1820351&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/gbuild.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/gbuild.mk Fri Jan 5 20:47:25 2018
@@ -36,7 +36,6 @@
# SOLARLIB
# UPD
-# GXX_INCLUDE_PATH (Linux)
# PTHREAD_CFLAGS (Linux)
# SYSTEM_ICU (Linux)
# SYSTEM_JPEG (Linux)
Modified: openoffice/trunk/main/solenv/gbuild/platform/freebsd.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/freebsd.mk?rev=1820351&r1=1820350&r2=1820351&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/freebsd.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/freebsd.mk Fri Jan 5 20:47:25
2018
@@ -56,15 +56,10 @@ gb_OSDEFS := \
-DUNX \
$(PTHREAD_CFLAGS) \
-ifeq ($(GXX_INCLUDE_PATH),)
-GXX_INCLUDE_PATH=$(COMPATH)/include/c++/$(shell gcc -dumpversion)
-endif
-
gb_COMPILERDEFS := \
-D$(COM) \
-DHAVE_GCC_VISIBILITY_FEATURE \
-DCPPU_ENV=gcc3 \
- -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
ifeq ($(CPUNAME),X86_64)
gb_CPUDEFS := -D$(CPUNAME)
Modified: openoffice/trunk/main/solenv/gbuild/platform/linux.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/linux.mk?rev=1820351&r1=1820350&r2=1820351&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/linux.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/linux.mk Fri Jan 5 20:47:25
2018
@@ -53,15 +53,10 @@ gb_OSDEFS := \
-DUNX \
$(PTHREAD_CFLAGS) \
-ifeq ($(GXX_INCLUDE_PATH),)
-GXX_INCLUDE_PATH=$(COMPATH)/include/c++/$(shell gcc -dumpversion)
-endif
-
gb_COMPILERDEFS := \
-D$(COM) \
-DHAVE_GCC_VISIBILITY_FEATURE \
-DCPPU_ENV=gcc3 \
- -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
ifeq ($(CPUNAME),X86_64)
gb_CPUDEFS := -D$(CPUNAME)
Modified: openoffice/trunk/main/solenv/gbuild/platform/macosx.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/macosx.mk?rev=1820351&r1=1820350&r2=1820351&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/macosx.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/macosx.mk Fri Jan 5 20:47:25
2018
@@ -60,7 +60,6 @@ gb_COMPILERDEFS := \
-D$(COM) \
-DHAVE_GCC_VISIBILITY_FEATURE \
-DCPPU_ENV=$(COMID) \
- -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
ifeq ($(CPUNAME),POWERPC)
gb_CPUDEFS := -DPOWERPC -DPPC
Modified: openoffice/trunk/main/solenv/gbuild/platform/os2.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/os2.mk?rev=1820351&r1=1820350&r2=1820351&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/os2.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/os2.mk Fri Jan 5 20:47:25 2018
@@ -55,15 +55,10 @@ gb_OSDEFS := \
-DOS2 \
$(PTHREAD_CFLAGS) \
-ifeq ($(GXX_INCLUDE_PATH),)
-GXX_INCLUDE_PATH=$(COMPATH)/include/c++/$(shell gcc -dumpversion)
-endif
-
gb_COMPILERDEFS := \
-D$(COM) \
-DHAVE_GCC_VISIBILITY_FEATURE \
-DCPPU_ENV=gcc3 \
- -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
gb_CPUDEFS := -DINTEL -D_X86_=1 -DX86
Modified: openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk?rev=1820351&r1=1820350&r2=1820351&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk Fri Jan 5
20:47:25 2018
@@ -72,16 +72,11 @@ gb_OSDEFS := \
-DWIN32 \
-DWNT \
-ifeq ($(GXX_INCLUDE_PATH),)
-GXX_INCLUDE_PATH=$(COMPATH)/include/c++/$(shell gcc -dumpversion)
-endif
-
gb_COMPILERDEFS := \
-DGCC \
-D$(CVER) \
-DCVER=$(CVER) \
-DGLIBC=2 \
- -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
-DCPPU_ENV=gcc3 \
-D_MT \
-D_NATIVE_WCHAR_T_DEFINED \
Modified: openoffice/trunk/main/solenv/inc/settings.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/settings.mk?rev=1820351&r1=1820350&r2=1820351&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/settings.mk (original)
+++ openoffice/trunk/main/solenv/inc/settings.mk Fri Jan 5 20:47:25 2018
@@ -1079,12 +1079,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)
Modified: openoffice/trunk/main/ure/source/uretest/Makefile.pln
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/ure/source/uretest/Makefile.pln?rev=1820351&r1=1820350&r2=1820351&view=diff
==============================================================================
--- openoffice/trunk/main/ure/source/uretest/Makefile.pln (original)
+++ openoffice/trunk/main/ure/source/uretest/Makefile.pln Fri Jan 5 20:47:25
2018
@@ -24,11 +24,8 @@
# The following variables can be set, if necessary (see README):
#URE_HOME := /opt/openoffice.org/ure
-#GXX_INCLUDE_PATH := /usr/include/g++
-
URE_HOME ?= /opt/openoffice.org/ure
-GXX_INCLUDE_PATH ?= /usr/include/g++
.DELETE_ON_ERROR:
@@ -93,7 +90,7 @@ out.pln/cppmain.o: cppmain.cc out.pln/cp
g++ -c -o $@ -fpic -Wall -Wno-ctor-dtor-privacy -I
$(SDK_HOME)/include/stl \
-I $(SDK_HOME)/include -I out.pln/include/cpputypes \
-I out.pln/include/types -DCPPU_ENV=gcc3 \
- -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) -DLINUX -DUNX $<
+ -DLINUX -DUNX $<
out.pln/cpptest.uno.so: out.pln/cpptest.o version.map | out.pln \
@@ -108,7 +105,7 @@ out.pln/cpptest.o: cpptest.cc out.pln/cp
g++ -c -o $@ -fpic -Wall -Wno-ctor-dtor-privacy -I
$(SDK_HOME)/include/stl \
-I $(SDK_HOME)/include -I out.pln/include/cpputypes \
-I out.pln/include/types -DCPPU_ENV=gcc3 \
- -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) -DLINUX -DUNX $<
+ -DLINUX -DUNX $<
out.pln/cppserver.uno.so: out.pln/cppserver.o version.map | out.pln \
@@ -123,7 +120,7 @@ out.pln/cppserver.o: cppserver.cc out.pl
g++ -c -o $@ -fpic -Wall -Wno-ctor-dtor-privacy -I
$(SDK_HOME)/include/stl \
-I $(SDK_HOME)/include -I out.pln/include/cpputypes \
-I out.pln/include/types -DCPPU_ENV=gcc3 \
- -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) -DLINUX -DUNX $<
+ -DLINUX -DUNX $<
out.pln/cpputypes.cppumaker.flag: | out.pln
Modified: openoffice/trunk/main/ure/source/uretest/README
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/ure/source/uretest/README?rev=1820351&r1=1820350&r2=1820351&view=diff
==============================================================================
--- openoffice/trunk/main/ure/source/uretest/README (original)
+++ openoffice/trunk/main/ure/source/uretest/README Fri Jan 5 20:47:25 2018
@@ -53,10 +53,6 @@ requirements, see the SDK Installation G
- URE_HOME (optional)
Overwrites the default URE location, that is, /opt/openoffice.org/ure.
-- GXX_INCLUDE_PATH (optional)
-Overwrites the default location of the GCC C++ headers (/usr/include/g++).
This
-information is needed by the STLport included in the URE.
-
Tests
-----
