[Libreoffice-commits] core.git: solenv/gbuild

[Michael Stahl]

 solenv/gbuild/extensions/post_GbuildToJson.mk |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 7a75b39273de47190b7a1fa20e0bcaca6d089033
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jan 12 15:33:57 2017 +0100

    gbuild: make 3.81 doesn't currently work with gbuildtojson
    
    There is some problem with the pattern rule in post_GbuildToJson.mk
    being ignored, causing spurious
    workdir/GbuildToJson/Library/lib*.exports files with bogus content to be
    written; rather than trying to adapt that to 3.81 pattern rule
    evaluation, just refuse to run with 3.81, which is obsolete anyway.
    
    Change-Id: I492866464b309f8c475e34e8f311e42bf8736247

diff --git a/solenv/gbuild/extensions/post_GbuildToJson.mk b/solenv/gbuild/extensions/post_GbuildToJson.mk
index a5f9ee2..d0e8611 100644
--- a/solenv/gbuild/extensions/post_GbuildToJson.mk
+++ b/solenv/gbuild/extensions/post_GbuildToJson.mk
@@ -9,6 +9,10 @@
 
 ifneq ($(filter gbuildtojson,$(MAKECMDGOALS)),)
 
+ifeq ($(MAKE_VERSION),3.81)
+$(error make version 3.81 not supported for gbuildtojson; install newer make via LODE)
+endif
+
 # possibly recurse to ensure gbuildtojson was build before running the modded make
 gb_GbuildToJson_prep := $(shell $(MAKE) -f $(SRCDIR)/solenv/Makefile Executable_gbuildtojson)
 gb_FULLDEPS:=