diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-07-20 13:28:24 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-07-21 14:10:22 +0000 |
| commit | cd0ac269f9df1e3ea1300cc877bf88f1674c4d3c (patch) | |
| tree | 50ad1eedb9ee334e14d56dfc50641a31e6ac3f6c /Makefile.in | |
| parent | ff5e57d2292b548d7f8607c47a38d9e39753d5fa (diff) | |
Makefile: re-run autogen.sh if JAVA_HOME went away
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>
(cherry picked from commit 086c13584dc672c4a07c6384ab7f08fa67ce0f95)
Reviewed-on: https://gerrit.libreoffice.org/27367
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 5e8b9de57910..0bbc1b468b5d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 |