Kaydet (Commit) b4801abd authored tarafından Petr Mladek's avatar Petr Mladek Kaydeden (comit) David Tardon

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/1938Reviewed-by: 's avatarDavid Tardon <dtardon@redhat.com>
Tested-by: 's avatarDavid Tardon <dtardon@redhat.com>
üst 143ecebc
# -*- 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:
......@@ -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 \
......
# -*- 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:
......@@ -52,6 +52,9 @@ endif
gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- '{ print $$1*10000+$$2*100+$$3 }')
gb_SHORTSTDC3 := 1
gb_SHORTSTDCPP3 := 6
gb_CPPU_ENV := gcc3
gb_AFLAGS := $(AFLAGS)
......
......@@ -364,18 +364,14 @@ endef
# InstallModuleTarget class
# NOTE: values of SHORTSTDC3 and SHORTSTDCPP3 are hardcoded, because we
# do not really need all the variability of definition that was
# originally in solenv/inc/tg_compv.mk . Each of the macros is only used
# on one place, and only for Linux.
define gb_InstallModuleTarget_InstallModuleTarget_platform
$(call gb_InstallModuleTarget_add_defs,$(1),\
$(gb_CPUDEFS) \
$(gb_OSDEFS) \
-DCOMID=gcc3 \
-DCOMNAME=gcc3 \
-DSHORTSTDC3=1 \
-DSHORTSTDCPP3=6 \
-DSHORTSTDC3=$(gb_SHORTSTDC3) \
-DSHORTSTDCPP3=$(gb_SHORTSTDCPP3) \
-D_gcc3 \
$(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \
)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment