Stefano Lattarini wrote: > On 08/31/2012 04:06 PM, Jim Meyering wrote: >> >> Hmm... actually there are a few other problems. See below. >> If you don't mind fixing those and reposting, I would be grateful. >> I'm stepping out for an hour or so. >> > Here is an updated series. Notice that there is still one spurious > failure: > > proper_name_utf8_requires_ICONV > Can't open src/Makefile.am: No such file or directory. > Can't open src/Makefile.am: No such file or directory. > ... > Can't open src/Makefile.am: No such file or directory. > 0.19 proper_name_utf8_requires_ICONV > > but that's due to a bug in the gnulib-provided 'maint.mk' AFAICS, > and I'm not going to fix it for the moment. > > Regards, > Stefano > > -*-*-*- > > Stefano Lattarini (9): > maint: add our 'bootstrap_post_import_hook' function > build: refactor how lists of coreutils programs are defined > build: don't use recursive make to build the 'src' subdirectory > build: fix generation of manpages for programs not built by default > maint: improve remake rules for maintainers > maint: remove unused target 'install-root' > maint: fix and simplify maintainer checks > maint: fix one stray reference to src/Makefile.am > maint: update gitignore entries
Thanks a lot. I've fixed the two remaining problems. I'll probably move (to precede) or merge these before pushing your changes. >From 44bc1cba4ab0a6fd4a2e96f8e6f1e0d27326995f Mon Sep 17 00:00:00 2001 From: Jim Meyering <[email protected]> Date: Fri, 31 Aug 2012 19:35:35 +0200 Subject: [PATCH 1/2] maint: disable sc_proper_name_utf8_requires_ICONV test * cfg.mk (local-checks-to-skip): Temporarily disable a test. This test will need to be adapted to work with a non-recursive build set-up, in which there is no Makefile.am alongside each program. --- cfg.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cfg.mk b/cfg.mk index 780e6a8..87f54c0 100644 --- a/cfg.mk +++ b/cfg.mk @@ -22,7 +22,8 @@ manual_title = Core GNU utilities url_dir_list = http://ftp.gnu.org/gnu/$(PACKAGE) # Tests not to run as part of "make distcheck". -local-checks-to-skip = +local-checks-to-skip = \ + sc_proper_name_utf8_requires_ICONV # Tools used to bootstrap this package, used for "announcement". bootstrap-tools = autoconf,automake,gnulib,bison -- 1.7.12.146.g16d26b1 >From ea8043e5b08956b804c1cc3cb79ee54f2d969b36 Mon Sep 17 00:00:00 2001 From: Jim Meyering <[email protected]> Date: Fri, 31 Aug 2012 20:05:29 +0200 Subject: [PATCH 2/2] maint: check-programs-vs-x: avoid a new syntax-check failure * cfg.mk (check-programs-vs-x): The new variable, $(all-progs-but-lbracket) contains libstdbuf.so, and it does not have a corresponding .x file, so exempt it. --- cfg.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/cfg.mk b/cfg.mk index 87f54c0..e1bcf27 100644 --- a/cfg.mk +++ b/cfg.mk @@ -234,6 +234,7 @@ all-progs-but-lbracket = $(filter-out [,$(patsubst src/%,%,$(all_programs))) check-programs-vs-x: @status=0; \ for p in dummy $(all-progs-but-lbracket); do \ + case $$p in *.so) continue;; esac; \ test $$p = dummy && continue; \ test $$p = ginstall && p=install || : ; \ test -f $(srcdir)/man/$$p.x \ -- 1.7.12.146.g16d26b1
