coreutils
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

success! [Re: [PATCH 22/22] maint: avoid distcheck failure...


From: Jim Meyering
Subject: success! [Re: [PATCH 22/22] maint: avoid distcheck failure...
Date: Sat, 01 Sep 2012 14:01:10 +0200

Jim Meyering wrote:
...
>> With this (final?) change, I expect "make distcheck" to succeed
>> using my current set of patches.
>
> Not quite:
...
> And fixed by this:
>
> Subject: [PATCH] build: restore handling of space-tainted build directory
>  name
>
> * man/local.mk: With commit v8.19-84-g08cf455, man page creation
> would fail when using a build directory name containing e.g.,
> spaces.

Finally.  With the patch below, "make distcheck" succeeds.

A test failure when running from a tainted build directory:

    FAIL: misc/help-version
    =======================
    ...
    + env stdbuf -oL true
    stdbuf: failed to find 'libstdbuf.so'
    + echo FAIL: stdbuf
    FAIL: stdbuf

i.e.,

    PASS: misc/stat-birthtime.sh
    stdbuf.sh: skipped test: unsafe absolute build directory name: 
/h/j/w/co/cu/tests/torture/taint/a b/coreutils-8.19.83-09b22-dirty
    PASS: misc/stat-nanoseconds.sh
    stty.sh: skipped test: requires controlling input terminal

I haven't tried to determine which patch introduced it,
but the fix is to build src/libstdbuf.so, not just libstdbuf.so.

It looks like it was provoked by this change:

    commit 3b69261cadff87de358226e09fa033c0a8aacafe
    Author: Stefano Lattarini <address@hidden>
    Date:   Sat Sep 1 01:46:54 2012 +0200

        maint: simplify declaration of "libexec" programs

        * configure.ac: No need to use 'gl_ADD_PROG' and an indirection
        variable '$optional_pkglib_progs' to declare the 'libstdbuf.so'
        "libexec" program; the decision to whether compile that program
        is not up to the user, but it only and simply depends on whether
        the 'stdbuf' "bin" program is to be built or not.

    diff --git a/configure.ac b/configure.ac
    index 99f293a..53dc706 100644
    --- a/configure.ac
    +++ b/configure.ac
    @@ -417,9 +417,9 @@ m4_include([m4/cu-progs.m4])

     # Now that we know which programs will actually be built up, figure out
     # which optional helper progs should be compiled.
    -optional_pkglib_progs=
     case " $optional_bin_progs " in
    -  *' stdbuf '*) gl_ADD_PROG([optional_pkglib_progs], [libstdbuf.so]) ;;
    +  *' stdbuf '*) pkglibexec_PROGRAMS='libstdbuf.so';;
    +  *) pkglibexec_PROGRAMS='';;
     esac

     man1_MANS=`
    @@ -444,8 +444,6 @@ EXTRA_MANS=`for p in $no_install_progs_default; do echo 
man/$p.1; done`
     # this case, only for $(bin_PROGRAMS).
     bin_PROGRAMS=`
       for p in $optional_bin_progs; do echo "src/$p\$(EXEEXT)"; done`
    -pkglibexec_PROGRAMS=`
    -  for p in $optional_pkglib_progs; do echo src/$p; done`

     # Normalize whitespace.
     man1_MANS=`echo $man1_MANS`

Do you feel like merging this into one of your patches?

diff --git a/configure.ac b/configure.ac
index 5d10cf4..3cfca68 100644
--- a/configure.ac
+++ b/configure.ac
@@ -415,10 +415,10 @@ dnl of coreutils programs to be built only upon explicit 
user request,
 dnl saving that list in the $no_install_progs_default shell variable.
 m4_include([m4/cu-progs.m4])

-# Now that we know which programs will actually be built up, figure out
+# Now that we know which programs will actually be built, determine
 # which optional helper progs should be compiled.
 case " $optional_bin_progs " in
-  *' stdbuf '*) pkglibexec_PROGRAMS='libstdbuf.so';;
+  *' stdbuf '*) pkglibexec_PROGRAMS='src/libstdbuf.so';;
   *) pkglibexec_PROGRAMS='';;
 esac



reply via email to

[Prev in Thread] Current Thread [Next in Thread]