9 files changed, 4 insertions, 78 deletions
diff --git a/config_host.mk.in b/config_host.mk.in
index 0af569c52a46..17ab6a63b5b5 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -559,7 +559,6 @@ export SYSTEM_PYTHON=@SYSTEM_PYTHON@
 export SYSTEM_REDLAND=@SYSTEM_REDLAND@
 export SYSTEM_RHINO=@SYSTEM_RHINO@
 export SYSTEM_SERVLETAPI=@SYSTEM_SERVLETAPI@
-export SYSTEM_STDLIBS=@SYSTEM_STDLIBS@
 export SYSTEM_UCPP=@SYSTEM_UCPP@
 export SYSTEM_VIGRA=@SYSTEM_VIGRA@
 export SYSTEM_ZLIB=@SYSTEM_ZLIB@
diff --git a/configure.ac b/configure.ac
index 8addb6e78f00..bc36fc1b3cdd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1245,11 +1245,6 @@ AC_ARG_WITH(system-jars,
          on the system. Use this to disable that]),,
     [with_system_jars="$with_system_libs"])
 
-AC_ARG_WITH(system-stdlibs,
-    AS_HELP_STRING([--without-system-stdlibs],
-        [Bundle the used libstdc++/libgcc_s into the installation set.]),,
-    [with_system_stdlibs="$with_system_libs"])
-
 AC_ARG_WITH(system-cairo,
     AS_HELP_STRING([--with-system-cairo],
         [Use Cairo libraries already on system.]),,
@@ -6780,19 +6775,6 @@ AC_SUBST(MINGWCXX)
 AC_SUBST(MINGWSTRIP)
 
 dnl ===================================================================
-dnl Check for system stdlibs
-dnl ===================================================================
-AC_MSG_CHECKING([whether to provide libstdc++/libgcc_s in the installset])
-if test "$with_system_stdlibs" != "no"; then
-    AC_MSG_RESULT([no])
-    SYSTEM_STDLIBS=YES
-else
-    AC_MSG_RESULT([yes])
-    SYSTEM_STDLIBS=NO
-fi
-AC_SUBST(SYSTEM_STDLIBS)
-
-dnl ===================================================================
 dnl Check for system zlib
 dnl ===================================================================
 if test "$with_system_zlib" = "auto"; then
diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
index 5bf8cd0b8b49..524613885150 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -2,7 +2,6 @@
 --with-system-dicts
 --without-unix-wrapper
 --without-system-zlib
---without-system-stdlibs
 --without-system-poppler
 --without-system-openssl
 --without-system-mozilla
diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf
index a56c09735d56..e9623c6c0717 100644
--- a/distro-configs/LibreOfficeOpenBSD.conf
+++ b/distro-configs/LibreOfficeOpenBSD.conf
@@ -38,7 +38,6 @@
 --with-system-openssl
 --with-system-poppler
 --with-system-redland
---with-system-stdlibs
 --with-system-zlib
 --with-vendor=The OpenBSD project
 --without-junit
diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf
index 56379c07719f..a9def8ea7a44 100644
--- a/distro-configs/OxygenOfficeLinux.conf
+++ b/distro-configs/OxygenOfficeLinux.conf
@@ -56,7 +56,6 @@
 --with-jdk-home=/usr/local/jdk1.6.0_23/
 --without-system-dicts
 --without-system-zlib
---without-system-stdlibs
 --without-system-poppler
 --without-system-openssl
 --without-system-mesa-headers
diff --git a/scp2/InstallModule_stdlibs.mk b/scp2/InstallModule_stdlibs.mk
deleted file mode 100644
index 5f6c171834aa..000000000000
--- a/scp2/InstallModule_stdlibs.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_InstallModule_InstallModule,scp2/stdlibs))
-
-$(eval $(call gb_InstallModule_add_scpfiles,scp2/stdlibs,\
-    scp2/source/stdlibs/file_stdlibs \
-))
-
-$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/stdlibs,\
-    scp2/source/stdlibs/module_stdlibs \
-))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk
index dd9a4d023879..3804043a14b8 100644
--- a/scp2/InstallScript_setup_osl.mk
+++ b/scp2/InstallScript_setup_osl.mk
@@ -67,9 +67,6 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\
 	$(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\
 		scp2/onlineupdate \
 	) \
-	$(if $(filter-out YES,$(SYSTEM_STDLIBS)),\
-		scp2/stdlibs \
-	) \
 	$(if $(filter TRUE,$(ENABLE_TDE)),\
 		scp2/tde \
 	) \
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index c4f8145d7e60..34c559fc212c 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -73,9 +73,6 @@ $(eval $(call gb_Module_add_targets,scp2,\
 	$(if $(filter TRUE,$(ENABLE_TDE)),\
 		InstallModule_tde \
 	) \
-	$(if $(filter-out YES,$(SYSTEM_STDLIBS)),\
-		InstallModule_stdlibs \
-	) \
 	$(if $(filter-out MACOSX,$(OS)),\
 		InstallScript_ure \
 	) \
diff --git a/setup_native/source/packinfo/packinfo_ure.txt b/setup_native/source/packinfo/packinfo_ure.txt
index 49c659112ae9..dfa037510252 100644
--- a/setup_native/source/packinfo/packinfo_ure.txt
+++ b/setup_native/source/packinfo/packinfo_ure.txt
@@ -20,6 +20,8 @@ Start
 module = "gid_Module_Root"
 solarispackagename = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure"
 solarisrequires = "SUNWzlibr"
+solarisprovides = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs"
+provides = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs"
 packagename = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure"
 copyright = "2012 The Document Foundation"
 solariscopyright = "solariscopyrightfile"
@@ -33,6 +35,8 @@ Start
 module = "gid_Module_Root_Ure_Hidden"
 solarispackagename = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure"
 solarisrequires = "SUNWzlibr"
+solarisprovides = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs"
+provides = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs"
 packagename = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure"
 copyright = "2012 The Document Foundation"
 solariscopyright = "solariscopyrightfile"
@@ -41,15 +45,3 @@ description = "UNO Runtime Environment"
 destpath = "/opt"
 packageversion = "%UREPACKAGEVERSION"
 End
-
-Start
-module = "gid_Module_Optional_Stdlibs"
-solarispackagename = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs"
-packagename = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs"
-copyright = "2012 The Document Foundation"
-solariscopyright = "solariscopyrightfile"
-vendor = "The Document Foundation"
-description = "libstdc++ and libgcc_s for too old Linux systems"
-destpath = "/opt"
-packageversion = "%UREPACKAGEVERSION"
-End