diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-12-13 16:52:50 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-12-17 18:10:34 +0100 |
| commit | 2122545ade85e71ff65fb0d4df011e9261b85d11 (patch) | |
| tree | da6edd27f5db1f149953cda4269e50949ee9898c /config_host.mk.in | |
| parent | 4b41e6f81593111a7ee1f8009ed1f21cc6fbebaa (diff) | |
Remove --with-stlport from LO 4.0
The STLport was only built for the benefit of old extensions on platforms that
once used it themselves (Linux x86, Solaris x86 and SPARC, Windows). We
deliberately break such old extensions for LO 4.0 by no longer shipping that
backwards-compatiblity cludge.
Keeps STLport listed in readlicense_oo/ because of
o3tl/inc/o3tl/compat_functionality.hxx.
Also removes GXX_INCLUDE_PATH, as that was only used by STLport (if at all?).
(cherry picked from commit 77d3777c8934171a9557a96872d020cf12443fb9, minus the
code that addressed Windows C4005 warnings -- which after all were due to
unrelated changes for PCH rather than this commit)
Conflicts:
postprocess/prj/build.lst
Change-Id: Ie138a219fbbc86fb5aaa7ea0b88cf349935d9829
Diffstat (limited to 'config_host.mk.in')
| -rw-r--r-- | config_host.mk.in | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 12a075265996..4bab5d669e1a 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -215,7 +215,6 @@ export GUI=@GUI@ export GUIBASE=@GUIBASE@ export GUIBASE_FOR_BUILD=@GUIBASE_FOR_BUILD@ export GUI_FOR_BUILD=@GUI_FOR_BUILD@ -export GXX_INCLUDE_PATH=@GXX_INCLUDE_PATH@ export HAVE_CXX0X=@HAVE_CXX0X@ export HAVE_GCC_AVX=@HAVE_GCC_AVX@ export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@ @@ -608,7 +607,6 @@ export WITH_LINKER_HASH_STYLE=@WITH_LINKER_HASH_STYLE@ export WITH_MOZAB4WIN=@WITH_MOZAB4WIN@ export WITH_MYSPELL_DICTS=@WITH_MYSPELL_DICTS@ export WITH_POOR_HELP_LOCALIZATIONS=@WITH_POOR_HELP_LOCALIZATIONS@ -export WITH_STLPORT=@WITH_STLPORT@ export WITH_THEMES=@WITH_THEMES@ export WORDS_BIGENDIAN=@WORDS_BIGENDIAN@ export WORKDIR=@WORKDIR@ |