From 2122545ade85e71ff65fb0d4df011e9261b85d11 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 13 Dec 2012 16:52:50 +0100 Subject: 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 --- Makefile.fetch | 3 --- 1 file changed, 3 deletions(-) (limited to 'Makefile.fetch') diff --git a/Makefile.fetch b/Makefile.fetch index 0cc0e32b29da..132244e81bd6 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -79,9 +79,6 @@ $(WORKDIR)/download: $(SRCDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)/M $(call fetch_Optional,VISIO,VISIO_TARBALL) \ ,$(call fetch_Download_item_special,http://dev-www.libreoffice.org/src,$(item))) $(foreach item, \ - 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz \ - 7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz \ - c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz \ 4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz \ $(call fetch_Optional,AFMS,$(AFMS_TARBALL)) \ $(call fetch_Optional,APACHE_COMMONS,$(APACHE_COMMONS_CODEC_TARBALL)) \ -- cgit