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

Makefile: re-run autogen.sh if JAVA_HOME went away

Browse source 
On Fedora, the weekly OpenJDK security updates put the headers into a
different directory each time because the full version of the package is
encoded in the name of the directory.  Then a incremental build breaks
somewhere in jvmfwk because the headers cannot be found in the old
directory.

So add a hack to detect a non-existent JAVA_HOME and re-run autogen.sh
in the hope that the following incremental build with work.

Change-Id: Iada3cfa3e9a0120d38c6b01484f505ff20770b72
Reviewed-on: https://gerrit.libreoffice.org/27339
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
This commit is contained in:
Michael Stahl 2016-07-20 13:28:24 +02:00
parent 20245ba975
commit 086c13584d
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile.in
View file

@ -45,7 +45,9 @@ $(BUILDDIR)/config_host.mk : $(wildcard \
$(BUILDDIR)/autogen.input \
$(BUILDDIR)/autogen.lastrun \
$(BUILDDIR)/autogen.sh \
)
) \
$(shell source $(SRCDIR)/bin/get_config_variables JAVA_HOME && \
if test -n "$${JAVA_HOME}" -a ! -d "$${JAVA_HOME}"; then echo force-restart; fi)
sh -c $(SRCDIR)/autogen.sh
else # MAKE_RESTARTS