[Libreoffice-commits] core.git: config_host.mk.in configure.ac distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeOpenBSD.conf distro-configs/OxygenOfficeLinux.conf external/CustomTarget_stdlibs.mk external/Module_external.mk external/Package_stdlibs.mk scp2/InstallModule_stdlibs.mk scp2/InstallScript_setup_osl.mk scp2/Module_scp2.mk setup_native/source
Fridrich Å trba
fridrich.strba at bluewin.ch
Tue Feb 19 01:05:44 PST 2013
config_host.mk.in | 1
configure.ac | 18 ------------
distro-configs/LibreOfficeLinux.conf | 1
distro-configs/LibreOfficeOpenBSD.conf | 1
distro-configs/OxygenOfficeLinux.conf | 1
external/CustomTarget_stdlibs.mk | 21 --------------
external/Module_external.mk | 10 ------
external/Package_stdlibs.mk | 17 -----------
scp2/InstallModule_stdlibs.mk | 38 --------------------------
scp2/InstallScript_setup_osl.mk | 3 --
scp2/Module_scp2.mk | 3 --
setup_native/source/packinfo/packinfo_ure.txt | 16 ++--------
12 files changed, 4 insertions(+), 126 deletions(-)
New commits:
commit 3708fe8434ad6f64d527215f4619556b0a5701ff
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Feb 19 10:04:59 2013 +0100
Kill the --without-system-stdlibs option
Change-Id: I54bff2c8593995829857d30b38b8626a8c1a1a4f
diff --git a/config_host.mk.in b/config_host.mk.in
index e2a0bef..43566cb 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -578,7 +578,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 5b0a5d9..7e7406c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1289,11 +1289,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.]),,
@@ -7127,19 +7122,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 c46c878..1c0aa3c 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -3,7 +3,6 @@
--with-myspell-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 f149adc..0122baa 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 56379c0..a9def8e 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/external/CustomTarget_stdlibs.mk b/external/CustomTarget_stdlibs.mk
deleted file mode 100644
index 786cb15..0000000
--- a/external/CustomTarget_stdlibs.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CustomTarget_CustomTarget,external/stdlibs))
-
-$(eval $(call gb_CustomTarget_register_targets,external/stdlibs,\
- libgcc_s.so.$(gb_SHORTSTDC3) \
- libstdc++.so.$(gb_SHORTSTDCPP3) \
-))
-
-$(call gb_CustomTarget_get_workdir,external/stdlibs)/lib%:
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),STL,1)
- $(PERL) -w $(SOLARENV)/bin/gccinstlib.pl $(notdir $@) $(dir $@)
-
-# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 757c06b..c5a312a 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -30,16 +30,6 @@ $(eval $(call gb_Module_add_targets,external,\
))
endif
-ifeq ($(SYSTEM_STDLIBS),NO)
-ifeq ($(gb_CPPU_ENV),gcc3)
-$(eval $(call gb_Module_add_targets,external,\
- CustomTarget_stdlibs \
- Package_stdlibs \
-))
-endif
-endif
-
-
ifeq ($(HAVE_GETOPT),NO)
$(eval $(call gb_Module_add_targets,external,\
UnpackedTarball_glibc \
diff --git a/external/Package_stdlibs.mk b/external/Package_stdlibs.mk
deleted file mode 100644
index 2a074b5..0000000
--- a/external/Package_stdlibs.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,stdlibs,$(call gb_CustomTarget_get_workdir,external/stdlibs)))
-
-$(eval $(call gb_Package_add_files,stdlibs,lib, \
- libgcc_s.so.$(gb_SHORTSTDC3) \
- libstdc++.so.$(gb_SHORTSTDCPP3) \
-))
-
-# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_stdlibs.mk b/scp2/InstallModule_stdlibs.mk
deleted file mode 100644
index 5f6c171..0000000
--- 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 at 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 a49c31f..166ab42 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 8052b91..e2b92b4 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 \
- ) \
))
# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/setup_native/source/packinfo/packinfo_ure.txt b/setup_native/source/packinfo/packinfo_ure.txt
index 49c6591..dfa0375 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
More information about the Libreoffice-commits
mailing list