[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - Makefile.in

[Michael Stahl]

 Makefile.in |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit cd0ac269f9df1e3ea1300cc877bf88f1674c4d3c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Jul 20 13:28:24 2016 +0200

    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 at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit 086c13584dc672c4a07c6384ab7f08fa67ce0f95)
    Reviewed-on: https://gerrit.libreoffice.org/27367
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/Makefile.in b/Makefile.in
index 5e8b9de..0bbc1b4 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