strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't export the various language lists and consolidate them

Browse source 
this further frees the environment for Windows builders, to reduce the
risk of running into "environment is too large for exec" errors when
attempting to use xargs in a recipe.

Change-Id: I7e0b97163372018edb12329f24bb1dfafeefc526
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144235
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
This commit is contained in:
Christian Lohmaier 2022-12-15 16:26:11 +01:00
parent 33e26da304
commit 183f5e38ee
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile.in
View file

@ -320,7 +320,7 @@ endif
define gb_Top_DoInstall
echo "$(1) in $(INSTALLDIR) ..." && \
$(SRCDIR)/solenv/bin/ooinstall $(2) "$(INSTALLDIR)"
WITH_LANG_LIST="$(WITH_LANG_LIST)" $(SRCDIR)/solenv/bin/ooinstall $(2) "$(INSTALLDIR)"
endef
@ -358,7 +358,7 @@ test-install: build
ifeq ($(OS_FOR_BUILD),WNT)
cd $(SRCDIR)/instsetoo_native && $(MAKE) LIBO_TEST_INSTALL=TRUE $(GMAKE_OPTIONS)
else
@$(SRCDIR)/solenv/bin/ooinstall $(TESTINSTALLDIR)
@WITH_LANG_LIST="$(WITH_LANG_LIST)" $(SRCDIR)/solenv/bin/ooinstall $(TESTINSTALLDIR)
ifeq ($(OS),MACOSX)
#
# Create Resources/*.lproj directories for languages supported by macOS
@ -449,10 +449,10 @@ endif
touch $@
distro-pack-install: install
$(SRCDIR)/bin/distro-install-clean-up
WITH_LANG_LIST="$(WITH_LANG_LIST)" WITH_POOR_HELP_LOCALIZATIONS="$(WITH_POOR_HELP_LOCALIZATIONS)" $(SRCDIR)/bin/distro-install-clean-up
$(SRCDIR)/bin/distro-install-desktop-integration
$(SRCDIR)/bin/distro-install-sdk
$(SRCDIR)/bin/distro-install-file-lists
WITH_LANG_LIST="$(WITH_LANG_LIST)" $(SRCDIR)/bin/distro-install-file-lists
install-package-%:
$(MAKE) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@

1
config_host.mk.in
View file

@ -729,7 +729,6 @@ export WITH_KRB5=@WITH_KRB5@
export WITH_LINKER_HASH_STYLE=@WITH_LINKER_HASH_STYLE@
export WITH_LOCALES=@WITH_LOCALES@
export WITH_MYSPELL_DICTS=@WITH_MYSPELL_DICTS@
export WITH_POOR_HELP_LOCALIZATIONS=@WITH_POOR_HELP_LOCALIZATIONS@
export WITH_THEMES=@WITH_THEMES@
export WITH_WEBDAV=@WITH_WEBDAV@
export WORKDIR=@WORKDIR@

7
config_host_lang.mk.in
View file

@ -3,6 +3,7 @@
# and not to be sourced in a shell session
#
export ALL_LANGS=@ALL_LANGS@
export WITH_LANG=@WITH_LANG@
export WITH_LANG_LIST=@WITH_LANG_LIST@
ALL_LANGS=@ALL_LANGS@
WITH_LANG=@WITH_LANG@
WITH_LANG_LIST=@WITH_LANG_LIST@
WITH_POOR_HELP_LOCALIZATIONS=@WITH_POOR_HELP_LOCALIZATIONS@