summaryrefslogtreecommitdiff
path: root/distro-configs
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-12-13 16:52:50 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-12-17 18:10:34 +0100
commit2122545ade85e71ff65fb0d4df011e9261b85d11 (patch)
treeda6edd27f5db1f149953cda4269e50949ee9898c /distro-configs
parent4b41e6f81593111a7ee1f8009ed1f21cc6fbebaa (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 'distro-configs')
-rw-r--r--distro-configs/LibreOfficeAndroid.conf1
-rw-r--r--distro-configs/LibreOfficeAndroidX86.conf1
-rw-r--r--distro-configs/LibreOfficeiOS.conf1
3 files changed, 0 insertions, 3 deletions
diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf
index 0758a8ac4328..3cf14c9fb961 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -19,7 +19,6 @@
--disable-systray
--without-junit
--without-ppds
---without-stlport
--without-helppack-integration
--without-myspell-dicts
--with-build-platform-configure-options=--disable-liblangtag
diff --git a/distro-configs/LibreOfficeAndroidX86.conf b/distro-configs/LibreOfficeAndroidX86.conf
index a453fa34f016..250ab6c5825f 100644
--- a/distro-configs/LibreOfficeAndroidX86.conf
+++ b/distro-configs/LibreOfficeAndroidX86.conf
@@ -19,7 +19,6 @@
--disable-systray
--without-junit
--without-ppds
---without-stlport
--without-helppack-integration
--without-myspell-dicts
--with-build-platform-configure-options=--disable-liblangtag
diff --git a/distro-configs/LibreOfficeiOS.conf b/distro-configs/LibreOfficeiOS.conf
index 6234d994529a..70bd6e4b7803 100644
--- a/distro-configs/LibreOfficeiOS.conf
+++ b/distro-configs/LibreOfficeiOS.conf
@@ -24,4 +24,3 @@
--without-java
--without-junit
--without-ppds
---without-stlport