diff options
| author | Petr Mladek <pmladek@suse.cz> | 2013-01-31 14:39:06 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-02-01 11:27:15 +0000 |
| commit | b4801abd2ee1ffa037e654731ffc20d6ff2c701c (patch) | |
| tree | eb5b2f8ef79fe1a8c87a1c56d6142fb1d778a8d1 /external | |
| parent | 143ecebc73e84dfcafdc2577f811152b4a415fde (diff) | |
gbuild: copy stdlibs into solver again when they are bundled in the installer
Otherwise the build --without-system-stdlibs fails; This option is used
for the universal Linux build
Change-Id: I0f7d87bb161d50748fee05f9c3f6a4b87b788aa4
Reviewed-on: https://gerrit.libreoffice.org/1938
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/CustomTarget_stdlibs.mk | 21 | ||||
| -rw-r--r-- | external/Module_external.mk | 10 | ||||
| -rw-r--r-- | external/Package_stdlibs.mk | 17 |
3 files changed, 48 insertions, 0 deletions
diff --git a/external/CustomTarget_stdlibs.mk b/external/CustomTarget_stdlibs.mk new file mode 100644 index 000000000000..786cb152b93c --- /dev/null +++ b/external/CustomTarget_stdlibs.mk @@ -0,0 +1,21 @@ +# -*- 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 c5a312abd5a7..757c06bcbca2 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -30,6 +30,16 @@ $(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 new file mode 100644 index 000000000000..2a074b5b43a6 --- /dev/null +++ b/external/Package_stdlibs.mk @@ -0,0 +1,17 @@ +# -*- 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: |