summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--top/maint.mk2
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index eb5867fe7e..d9604f013d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2016-12-31 Jim Meyering <meyering@fb.com>
+
+ maint.mk: do not always evaluate intprops-related shell
+ * top/maint.mk (_intprops_names): Change := to just "=" to avoid
+ using gnulib_dir undefined (gnulib_dir is defined later in the
+ file, which will be fixed separately), and besides, there is no
+ need to incur the cost of this shell invocation for every single
+ use of this .mk file. Reported by Eric Blake in
+ https://lists.gnu.org/archive/html/bug-gnulib/2016-12/msg00137.html
+
2016-12-30 Jim Meyering <meyering@fb.com>
maint.mk: improve sc_prohibit_intprops_without_use
diff --git a/top/maint.mk b/top/maint.mk
index 6eb9361ac4..64db9ee00e 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -661,7 +661,7 @@ sc_prohibit_strings_without_use:
gl_extract_define_simple = \
/^\# *define ([A-Z]\w+)\(/ and print $$1
# Filter out duplicates and convert to a space-separated list:
-_intprops_names := \
+_intprops_names = \
$(shell f=$(gnulib_dir)/lib/intprops.h; \
perl -lne '$(gl_extract_define_simple)' $$f | sort -u | tr '\n' ' ')
# Remove trailing space and convert to a regular expression: