diff options
| author | James Youngman <jay@gnu.org> | 2018-09-23 22:17:45 +0100 |
|---|---|---|
| committer | James Youngman <jay@gnu.org> | 2018-09-23 22:17:45 +0100 |
| commit | 64d51c85c1ffef59c9262e1d9b8ff1aa00701ca4 (patch) | |
| tree | 8692282847f674820cac703f8d1b8eaeed53fa8c | |
| parent | 6025450a9447f36d5d793b8ecf622c439c8e382c (diff) | |
| download | hydra-recipes-64d51c85c1ffef59c9262e1d9b8ff1aa00701ca4.tar.gz | |
findutils: update autoconf instructions.
Also use a recent version of Automake. We currently use Automake
1.15, but I don't know a way to specify that, so instead I switched
from "automake111x" to "automake" on the assumption that this would
select a more recent version (head, I guess).
Findutils git switched from using "sh ./import-gnulib.sh" to using
"./bootstrap" in 2015 (findutils git commits
3752a0a46ea4a991e4d24b8b3233ead5ec4beb42 and
f64dbff719c5cb625612cc6670f946d2b32c511f), but Hydra didn't get
updated.
| -rw-r--r-- | findutils/release.nix | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/findutils/release.nix b/findutils/release.nix index bb98bd7..d6509fe 100644 --- a/findutils/release.nix +++ b/findutils/release.nix @@ -26,13 +26,13 @@ let description = "GNU Findutils, a program to find files"; longDescription = - '' The GNU Find Utilities are the basic directory searching utilities + '' The GNU Findutils are the basic directory searching utilities of the GNU operating system. These programs are typically used in conjunction with other programs to provide modular and powerful directory search and file locating capabilities to other commands. ''; - homepage = http://savannah.gnu.org/projects/findutils; + homepage = https://www.gnu.org/software/findutils; license = "GPLv3+"; @@ -49,17 +49,18 @@ let name = "findutils-tarball"; src = findutilsSrc; buildInputs = - [ automake111x gettext gperf bison groff git + [ automake gettext gperf bison groff git texinfo xz cvs # for `autopoint' ]; autoconfPhase = - # `gnulib-tool' wants write access to the Gnulib directory, e.g., - # to create `./build-aux/arg-nonnull.h.tmp'. Thus we have to copy - # the whole Gnulib tree in a writable place. - '' cp -rv "${gnulib}" ../gnulib - chmod -R u+w ../gnulib - sh ./import-gnulib.sh -d ../gnulib + '' + # Tell bootstrap not to download po files, because that + # would make the build non-hermetic. Contrariwise we + # allow bootstrap to use git to set up the gnulib module, + # so that we get exactly the version configured (in + # findutils git) for the submodule. + ./bootstrap --no-bootstrap-sync --copy --skip-po ''; inherit meta succeedOnFailure keepBuildDirectory; }; |
