[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] maint.mk: ensure gnulib_dir is defined before use in shell
From: |
Eric Blake |
Subject: |
Re: [PATCH] maint.mk: ensure gnulib_dir is defined before use in shell |
Date: |
Sat, 31 Dec 2016 07:10:58 -0600 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 |
On 12/31/2016 03:33 AM, Jim Meyering wrote:
>>
>> Appears to work for me, but I'll wait until tomorrow or a review
>> before pushing.
>>
>
> Thank you. That is a fine patch.
> I have also pushed this:
Thanks. Given your patch, I reworded things slightly; here's what I'm
pushing.
From 68bfd6607ddf034889257e1effa89b688f3d3f2b Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Fri, 30 Dec 2016 20:37:10 -0600
Subject: [PATCH] maint.mk: hoist gnulib_dir definition earlier
Commit 1894933 introduced a temporary warning during all uses of 'make':
Can't open /lib/intprops.h: No such file or directory.
due to an early evaluation of $(shell) prior to the default definition
of $(gnulib_dir). While that has been fixed in commit ffff79d, hoisting
the definition to the top will prevent further edits from inadvertently
reintroducing the problem.
* top/maint.mk (gnulib_dir): Move near top of file.
Signed-off-by: Eric Blake <address@hidden>
---
ChangeLog | 5 +++++
top/maint.mk | 5 ++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index d9604f0..5682403 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-12-31 Eric Blake <address@hidden>
+
+ maint.mk: hoist gnulib_dir definition earlier
+ * top/maint.mk (gnulib_dir): Move near top of file.
+
2016-12-31 Jim Meyering <address@hidden>
maint.mk: do not always evaluate intprops-related shell
diff --git a/top/maint.mk b/top/maint.mk
index 64db9ee..46aea9b 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -55,6 +55,10 @@ VC = $(GIT)
VC_LIST = $(srcdir)/$(_build-aux)/vc-list-files -C $(srcdir)
+# You can override this variable in cfg.mk if your gnulib submodule lives
+# in a different location.
+gnulib_dir ?= $(srcdir)/gnulib
+
# You can override this variable in cfg.mk to set your own regexp
# matching files to ignore.
VC_LIST_ALWAYS_EXCLUDE_REGEX ?= ^$$
@@ -1288,7 +1292,6 @@ vc-diff-check:
rel-files = $(DIST_ARCHIVES)
-gnulib_dir ?= $(srcdir)/gnulib
gnulib-version = $$(cd $(gnulib_dir) \
&& { git describe || git rev-parse --short=10 HEAD; } )
bootstrap-tools ?= autoconf,automake,gnulib
--
2.9.3
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature