From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56868) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpzvP-0007Vw-L4 for guix-patches@gnu.org; Thu, 07 Sep 2017 12:45:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpzvL-0003YC-0j for guix-patches@gnu.org; Thu, 07 Sep 2017 12:45:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:45876) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dpzvK-0003Y2-TE for guix-patches@gnu.org; Thu, 07 Sep 2017 12:45:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dpzvK-00041h-MS for guix-patches@gnu.org; Thu, 07 Sep 2017 12:45:02 -0400 Subject: [bug#28384] [PATCH] gnu: Fix build failures caused by commit. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:56525) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpzui-0007BZ-9O for guix-patches@gnu.org; Thu, 07 Sep 2017 12:44:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpzud-000381-IC for guix-patches@gnu.org; Thu, 07 Sep 2017 12:44:24 -0400 Received: from mout02.posteo.de ([185.67.36.66]:33105) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dpzud-0002yg-Be for guix-patches@gnu.org; Thu, 07 Sep 2017 12:44:19 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 3BF2E20BF5 for ; Thu, 7 Sep 2017 18:44:10 +0200 (CEST) From: Kei Kebreau Date: Thu, 7 Sep 2017 12:43:40 -0400 Message-Id: <20170907164340.32328-1-kkebreau@posteo.net> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 28384@debbugs.gnu.org Cc: Kei Kebreau * gnu/packages/bioinformatics.scm (seek)[arguments]: Modify unpack phase. * gnu/packages/ci.scm (cuirass)[arguments]: Add patch-/bin/sh phase. --- gnu/packages/bioinformatics.scm | 2 ++ gnu/packages/ci.scm | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index bf8eb2e69..699c463bf 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4488,6 +4488,8 @@ distribution, coverage uniformity, strand specificity, etc.") (modify-phases %standard-phases (add-after 'unpack 'bootstrap (lambda _ + (substitute* "gen_tools_am" + (("/usr/bin/env perl") (which "perl"))) (zero? (system* "bash" "gen_auto")))) (add-after 'build 'build-additional-tools (lambda* (#:key make-flags #:allow-other-keys) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index c449754be..3b182b826 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -216,7 +216,11 @@ their dependencies.") (substitute* "Makefile.am" (("tests/repo.scm \\\\") "\\")) #t)) - (add-after 'disable-repo-tests 'bootstrap + (add-after 'disable-repo-tests 'patch-/bin/sh + (lambda _ + (substitute* "build-aux/git-version-gen" + (("#!/bin/sh") (string-append "#!" (which "sh")))))) + (add-after 'patch-/bin/sh 'bootstrap (lambda _ (zero? (system* "sh" "bootstrap")))) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) -- 2.14.1