odk/setsdkenv_unix.sh.in | 18 ------------------
odk/settings/settings.mk | 12 ++++++------
set_soenv.in | 8 +++-----
solenv/doc/gbuild/solenv/gbuild/gbuild.mk | 1 -
solenv/gbuild/gbuild.mk | 1 -
solenv/gbuild/platform/freebsd.mk | 5 -----
solenv/gbuild/platform/linux.mk | 5 -----
solenv/gbuild/platform/macosx.mk | 1 -
solenv/gbuild/platform/os2.mk | 5 -----
solenv/gbuild/platform/winmingw.mk | 5 -----
solenv/inc/settings.mk | 6 ------
ure/source/uretest/Makefile.pln | 9 +++------
ure/source/uretest/README | 4 ----
13 files changed, 12 insertions(+), 68 deletions(-)
New commits:
commit 437a537883088da583bef724d744b9481c684228
Author: Don Lewis <truck...@apache.org>
Date: Fri Jan 5 20:47:25 2018 +0000
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.
diff --git a/odk/setsdkenv_unix.sh.in b/odk/setsdkenv_unix.sh.in
index 6c011700fedf..5a7fa6382f64 100644
--- a/odk/setsdkenv_unix.sh.in
+++ b/odk/setsdkenv_unix.sh.in
@@ -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
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 93b116306991..0976ec27b988 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -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
diff --git a/set_soenv.in b/set_soenv.in
index 6ec61c6be3c2..8912b8b5719e 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -57,8 +57,8 @@ my ( $outfile, $outfile_sh, $outfile_bat, $bootfile,
$newline, $comment,
$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_SHADOW_API@", "e" );
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 "" ) {
diff --git a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
b/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
index e221d3904a65..f8c8ac903bb6 100644
--- a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
+++ b/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
@@ -91,7 +91,6 @@ namespace gb
static const Path SDKDIR;
};
-// GXX_INCLUDE_PATH (Linux)
// PTHREAD_CFLAGS (Linux)
// SYSTEM_ICU (Linux)
// SYSTEM_JPEG (Linux)
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index b0ac8c1ebd95..e63e96d910c0 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -36,7 +36,6 @@
# SOLARLIB
# UPD
-# GXX_INCLUDE_PATH (Linux)
# PTHREAD_CFLAGS (Linux)
# SYSTEM_ICU (Linux)
# SYSTEM_JPEG (Linux)
diff --git a/solenv/gbuild/platform/freebsd.mk
b/solenv/gbuild/platform/freebsd.mk
index 94786d431513..26ecec2c29b5 100644
--- a/solenv/gbuild/platform/freebsd.mk
+++ b/solenv/gbuild/platform/freebsd.mk
@@ -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)
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index ac0d3aa0273a..2cd94ef471fd 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -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)
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 273276c93b62..03e693b0211f 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -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
diff --git a/solenv/gbuild/platform/os2.mk b/solenv/gbuild/platform/os2.mk
index 706e443702a7..41dc3e70c5f9 100644
--- a/solenv/gbuild/platform/os2.mk
+++ b/solenv/gbuild/platform/os2.mk
@@ -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
diff --git a/solenv/gbuild/platform/winmingw.mk
b/solenv/gbuild/platform/winmingw.mk
index 318c2e27547a..cc185152f01f 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -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 \
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index f5a4ed4c8431..bd72205295a2 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -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)
diff --git a/ure/source/uretest/Makefile.pln b/ure/source/uretest/Makefile.pln
index 3b42a617962e..08e5d73ea80b 100644
--- a/ure/source/uretest/Makefile.pln
+++ b/ure/source/uretest/Makefile.pln
@@ -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/cpputypes.cppumaker.flag \
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/cpputypes.cppumaker.flag \
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.pln/cpputypes.cppumaker.flag \
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
diff --git a/ure/source/uretest/README b/ure/source/uretest/README
index 94196916dc82..0a869f816b48 100644
--- a/ure/source/uretest/README
+++ b/ure/source/uretest/README
@@ -53,10 +53,6 @@ requirements, see the SDK Installation Guide
($SDK_HOME/docs/install.html).
- 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
-----
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
