From 2e4a66a7617de57cbf8462bdd1e555aef0b13c47 Mon Sep 17 00:00:00 2001 From: Alasdair G Kergon Date: Tue, 14 May 2013 19:29:26 +0100 Subject: [PATCH] make: fix exported symbols regex for non-GNU sed Remove a couple of incorrect backslashes from expressions used to generate lists of exported symbols so it works with busybox sed. [John Spencer] --- WHATS_NEW | 1 + make.tmpl.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/WHATS_NEW b/WHATS_NEW index 626a35424..8f1931029 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.99 - =================================== + Fix exported symbols regex for non-GNU busybox sed. Accept --yes in all commands so test scripts can be simpler. Fix alignment of PV data area if detected alignment less than 1 MB (2.02.74). Fix memory resource leak in memlocking error path. diff --git a/make.tmpl.in b/make.tmpl.in index b33ddb352..df7453da7 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -392,7 +392,7 @@ distclean: cleandir $(SUBDIRS.distclean) ( cat $(srcdir)/.exported_symbols; \ if test x$(EXPORTED_HEADER) != x; then \ $(CC) -E -P $(INCLUDES) $(DEFS) $(EXPORTED_HEADER) | \ - $(SED) -ne "/^typedef|}/!s/.*[ \*]\(\$(EXPORTED_FN_PREFIX)_[a-z0-9_]*\)(.*/\1/p"; \ + $(SED) -ne "/^typedef|}/!s/.*[ *]\($(EXPORTED_FN_PREFIX)_[a-z0-9_]*\)(.*/\1/p"; \ fi \ ) > $@