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

Makefile: try to fix downloading externals for build platform

Browse source 
When cross-compiling, it's possible that an external is only used on
the build platform and not the host platform.  Attempt to fix this by
invoking "make fetch" twice; it looks like this should not be
combined with the exising "build-tools" invocation because that needs to
be delayed until everything is fetched.

Change-Id: I42626a30359d54dce3c0a5a8ea07045c099cea59
Reviewed-on: https://gerrit.libreoffice.org/37912
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
This commit is contained in:
Michael Stahl 2017-05-22 17:21:51 +02:00
parent 04e27df3c1
commit fe3fb5ecd3
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.fetch
View file

@ -96,7 +96,7 @@ endef
download: $(WORKDIR)/download
$(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)/Makefile.fetch
$(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(SRCDIR)/Makefile.fetch
-@mkdir -p $(TARFILE_LOCATION)/tmp
@date >> $(fetch_LOGFILE)
$(foreach item, \

2
Makefile.in
View file

@ -275,6 +275,8 @@ help showmodules gbuildtojson:
$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@
cross-toolset: bootstrap fetch
# fetch again in case there are externals only needed on build platform
$(MAKE) gb_Side=build $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile fetch
$(MAKE) gb_Side=build $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild build-tools