With the current version on Savannah, 'make distcheck' fails for me on Ubuntu
18.04 as shown at the end of this email. This glitch seems to have been
introduced in February 2016 by the commit "maint: dist-check.mk: remove .deps
dirs before comparing". Although the attached patch works around the problem, I
didn't install it as I'm puzzled as to why the 2016 patch was needed since "make
distclean" should remove any .deps subdirectories.
...
make[4]: Leaving directory
'/home/eggert/src/gnu/gzip/tests/torture/gzip/test/gzip-1.9.18-9c2a'
Making distclean in tests
make[4]: Entering directory
'/home/eggert/src/gnu/gzip/tests/torture/gzip/test/gzip-1.9.18-9c2a/tests'
test -z "gzip-env.log helin-segv.log help-version.log hufts.log keep.log
list.log memcpy-abuse.log mixed.log null-suffix-clobber.log reproducible.log
stdin.log timestamp.log trailing-nul.log unpack-invalid.log unpack-valid.log
upper-suffix.log z-suffix.log zdiff.log zgrep-f.log zgrep-context.log
zgrep-signal.log znew-k.log" || rm -f gzip-env.log helin-segv.log
help-version.log hufts.log keep.log list.log memcpy-abuse.log mixed.log
null-suffix-clobber.log reproducible.log stdin.log timestamp.log
trailing-nul.log unpack-invalid.log unpack-valid.log upper-suffix.log
z-suffix.log zdiff.log zgrep-f.log zgrep-context.log zgrep-signal.log znew-k.log
test -z "gzip-env.trs helin-segv.trs help-version.trs hufts.trs keep.trs
list.trs memcpy-abuse.trs mixed.trs null-suffix-clobber.trs reproducible.trs
stdin.trs timestamp.trs trailing-nul.trs unpack-invalid.trs unpack-valid.trs
upper-suffix.trs z-suffix.trs zdiff.trs zgrep-f.trs zgrep-context.trs
zgrep-signal.trs znew-k.trs" || rm -f gzip-env.trs helin-segv.trs
help-version.trs hufts.trs keep.trs list.trs memcpy-abuse.trs mixed.trs
null-suffix-clobber.trs reproducible.trs stdin.trs timestamp.trs
trailing-nul.trs unpack-invalid.trs unpack-valid.trs upper-suffix.trs
z-suffix.trs zdiff.trs zgrep-f.trs zgrep-context.trs zgrep-signal.trs znew-k.trs
test -z "test-suite.log" || rm -f test-suite.log
test -z "" || rm -f
test . = "." || test -z "" || rm -f
rm -f Makefile
make[4]: Leaving directory
'/home/eggert/src/gnu/gzip/tests/torture/gzip/test/gzip-1.9.18-9c2a/tests'
rm -f config.status config.cache config.log configure.lineno
config.status.lineno
rm -rf ./.deps
rm -f Makefile
make[3]: Leaving directory
'/home/eggert/src/gnu/gzip/tests/torture/gzip/test/gzip-1.9.18-9c2a'
(cd /home/eggert/src/gnu/gzip/tests/torture/gzip/test && mv gzip-1.9.18-9c2a
gzip-1.9.18-9c2a.old \
&& ${TAR-tar} -Jxf - ) < gzip-1.9.18-9c2a.tar.xz
find /home/eggert/src/gnu/gzip/tests/torture/gzip/test/gzip-1.9.18-9c2a.old
/home/eggert/src/gnu/gzip/tests/torture/gzip/test/gzip-1.9.18-9c2a -name .deps |
xargs rmdir
rmdir: missing operand
Try 'rmdir --help' for more information.
dist-check.mk:174: recipe for target 'my-distcheck' failed
make[2]: *** [my-distcheck] Error 123
make[2]: Leaving directory '/home/eggert/src/gnu/gzip'
Makefile:2277: recipe for target 'distcheck-hook' failed
make[1]: *** [distcheck-hook] Error 2
make[1]: Leaving directory '/home/eggert/src/gnu/gzip'
Makefile:1963: recipe for target 'distcheck' failed
make: *** [distcheck] Error 1
>From 0c13dbe0259f477325d01a21105fd6bbd17fcdec Mon Sep 17 00:00:00 2001
From: Paul Eggert <egg...@cs.ucla.edu>
Date: Mon, 24 Dec 2018 07:55:38 -0800
Subject: [PATCH] maint: dist-check.mk: give rmdir an arg
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* dist-check.mk (my-distcheck): Donât assume âmake distcleanâ
leaves behind a .deps subdirectory.
---
dist-check.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dist-check.mk b/dist-check.mk
index 830ad24..583fb1a 100644
--- a/dist-check.mk
+++ b/dist-check.mk
@@ -174,7 +174,7 @@ my-distcheck: $(DIST_ARCHIVES) $(local-check)
$(MAKE) syntax-check
$(MAKE) check
-rm -rf $(t)
- mkdir -p $(t)
+ mkdir -p $(t)/.deps
$(amtar_extract_) $(preferred_tarball_) -C $(t)
(set -e; cd $(t)/$(distdir); \
./configure --quiet --enable-gcc-warnings; \
@@ -188,7 +188,7 @@ my-distcheck: $(DIST_ARCHIVES) $(local-check)
)
(cd $(t) && mv $(distdir) $(distdir).old \
&& $(amtar_extract_) - ) < $(preferred_tarball_)
- find $(t)/$(distdir).old $(t)/$(distdir) -name .deps | xargs rmdir
+ find $(t) -name .deps | xargs rmdir
diff -ur $(t)/$(distdir).old $(t)/$(distdir)
-rm -rf $(t)
rmdir $(tmpdir)/$(PACKAGE) $(tmpdir)
--
2.17.1
