On 11/20/2012 10:32 PM, Ludovic Courtès wrote: > The recipe had a hack to replace the /usr/bin/perl shebang with the > right path: > > > http://git.sv.gnu.org/cgit/hydra-recipes.git/tree/coreutils/release.nix?id=b09570ad2c3c5b179213cd0bbfecedced7ca0ce1#n66 > > I just removed it: > > > http://git.sv.gnu.org/cgit/hydra-recipes.git/commit/?id=178efc3c953c2c62fb328c59cf099ebc2b77ed7d
Thanks, the job 'build' is working again. ;-) Below are 2 other proposed changes: * 6a3976a coreutils: remove su * 8b6569f coreutils: job manual is also non-recursive now I'm not sure about the 2nd hunk in patch 2/2: it's strange that target "install-html" depends on "install-html-recursive" which is undefined. For now, it may suffice to use "install-html-am" directly instead. Have a nice day, Berny >From 6a3976ad378874968e5eb5efc864a8c940ad7c8f Mon Sep 17 00:00:00 2001 From: Bernhard Voelker <[email protected]> Date: Thu, 22 Nov 2012 09:58:41 +0100 Subject: [PATCH 1/2] coreutils: remove su * coreutils/release.nix (build, xbuild_gnu, coverage): Remove su. --- coreutils/release.nix | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coreutils/release.nix b/coreutils/release.nix index 7b55f44..26a573e 100644 --- a/coreutils/release.nix +++ b/coreutils/release.nix @@ -85,7 +85,7 @@ let src = jobs.tarball; buildInputs = buildInputsFrom pkgs ; configureFlags = let stdenv = pkgs.stdenv; in - [ "--enable-install-program=arch,hostname,su" ] + [ "--enable-install-program=arch,hostname" ] ++ (stdenv.lib.optional stdenv.isLinux [ "--enable-gcc-warnings" ]); inherit meta succeedOnFailure keepBuildDirectory; }; @@ -101,7 +101,7 @@ let src = jobs.tarball; buildInputs = [ pkgs.gmp ]; buildNativeInputs = with pkgs; [ perl xz ]; - configureFlags = [ "--enable-install-program=arch,hostname,su" ]; + configureFlags = [ "--enable-install-program=arch,hostname" ]; doCheck = false; inherit meta succeedOnFailure keepBuildDirectory; }).hostDrv; @@ -110,7 +110,7 @@ let pkgs.releaseTools.coverageAnalysis { name = "coreutils-coverage"; src = jobs.tarball; - configureFlags = [ "--enable-install-program=arch,hostname,su" ]; + configureFlags = [ "--enable-install-program=arch,hostname" ]; buildInputs = buildInputsFrom pkgs; postCheck = # Remove the file that confuses lcov. -- 1.7.7 >From 8b6569f3ab4bb83cb1f19d465d15e8283118b191 Mon Sep 17 00:00:00 2001 From: Bernhard Voelker <[email protected]> Date: Thu, 22 Nov 2012 10:03:15 +0100 Subject: [PATCH 2/2] coreutils: job manual is also non-recursive now * coreutils/release.nix (manual): Remove '-C doc' from make call as the targets html and pdf are also non-recursive now. Use 'install-html-am' instead of 'install-html' as the depending 'install-html-recursive' is currently undefined. Likewise for 'install-pdf-am'. --- coreutils/release.nix | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coreutils/release.nix b/coreutils/release.nix index 26a573e..56196b3 100644 --- a/coreutils/release.nix +++ b/coreutils/release.nix @@ -127,9 +127,9 @@ let buildInputs = buildInputsFrom pkgs ++ [ pkgs.texinfo pkgs.texLive ]; doCheck = false; - buildPhase = "make -C doc html pdf"; + buildPhase = "make html pdf"; installPhase = - '' make -C doc install-html install-pdf + '' make install-html-am install-pdf-am ensureDir "$out/nix-support" echo "doc manual $out/share/doc/coreutils/coreutils.html" >> "$out/nix-support/hydra-build-products" -- 1.7.7
