From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57942) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dqRUP-0003E6-CN for guix-patches@gnu.org; Fri, 08 Sep 2017 18:11:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dqRUM-0001QS-7M for guix-patches@gnu.org; Fri, 08 Sep 2017 18:11:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:47827) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dqRUM-0001Q7-3c for guix-patches@gnu.org; Fri, 08 Sep 2017 18:11:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dqRUL-0005Zf-Lu for guix-patches@gnu.org; Fri, 08 Sep 2017 18:11:01 -0400 Subject: [bug#28384] [PATCH] gnu: Fix build failures caused by commit. Resent-Message-ID: From: Kei Kebreau References: <20170907164340.32328-1-kkebreau@posteo.net> <87o9ql9oxa.fsf@gnu.org> <87377xdtwy.fsf@posteo.net> <87efrh9bhk.fsf@gnu.org> Date: Fri, 08 Sep 2017 18:10:14 -0400 In-Reply-To: <87efrh9bhk.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Fri, 08 Sep 2017 22:33:27 +0200") Message-ID: <87y3podepl.fsf@posteo.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" 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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 28384@debbugs.gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable ludo@gnu.org (Ludovic Court=C3=A8s) writes: > Kei Kebreau skribis: > >> ludo@gnu.org (Ludovic Court=C3=A8s) writes: >> >>> Hi Kei, >>> >>> The subject is truncated. :-) Caused by which commit? >>> >>> Kei Kebreau skribis: >>> >>>> * gnu/packages/bioinformatics.scm (seek)[arguments]: Modify unpack pha= se. >>>> * gnu/packages/ci.scm (cuirass)[arguments]: Add patch-/bin/sh phase. >>> >>> This is weird, normally the =E2=80=98patch-source-shebangs=E2=80=99 pha= se, which happens >>> right before =E2=80=98configure=E2=80=99, should take care of these, no? >>> >> >> Normally the 'patch-source-shebangs' does just that, but in this case >> the script needs to be patched because the bootstrapping phase depends >> on perl. > > OK. I don=E2=80=99t understand at what point this became necessary thoug= h. > It's probably a result of moving the 'bootstrap' phase before the 'patch-source-shebangs' phase. Without this change, the seek package builds fine. I have no preference either way, though I notice that the same thing is done for guile-for-guile-emacs. >> From 87ea8addad973568d8599fb93c8df9766b96b6a1 Mon Sep 17 00:00:00 2001 >> From: Kei Kebreau >> Date: Sat, 29 Jul 2017 11:28:42 -0400 >> Subject: [PATCH] gnu: Use 'modify-phases' syntax. >> To: guix-patches@gnu.org > > Wrong patch. :-) > > Ludo=E2=80=99. Fixed! --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=0001-gnu-Fix-build-failures-caused-by-commit.patch Content-Transfer-Encoding: quoted-printable From=20d9eee184cf80252092c34864d492527ee768a7fb Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 7 Sep 2017 09:36:28 -0400 Subject: [PATCH] gnu: Fix build failures caused by commit d10092b849153dc27cfed0a9601fde6c7bdec918. * gnu/packages/bioinformatics.scm (seek)[arguments]: Modify unpack phase. * gnu/packages/ci.scm (cuirass)[arguments]: Add patch-/bin/sh phase. =2D-- gnu/packages/bioinformatics.scm | 2 ++ gnu/packages/ci.scm | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.= scm index bf8eb2e69..699c463bf 100644 =2D-- 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..f3259bfcd 100644 =2D-- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -216,7 +216,12 @@ their dependencies.") (substitute* "Makefile.am" (("tests/repo.scm \\\\") "\\")) #t)) =2D (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")))) + #t)) + (add-after 'patch-/bin/sh 'bootstrap (lambda _ (zero? (system* "sh" "bootstrap")))) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) =2D-=20 2.14.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAlmzFUYACgkQ5qXuPBlG eg1DnQ/+P+l6Ef2VGjPZqWZP0q1s6WKPjHQc98hg2aqcRmKQxVkX2TrL6JiLJot9 Y9tOnamoyQ9zBF0DEfQBd8Tz0kIE4h/P2xNS4koWn7lTty+Mqkly2ayvMAuAE+4N 8VLpj5YmzX/ekbLl1k2ic3hcP0qvjSsenoLYj5hjxPaVVjzra/wCZhFRtm+Fo8Rn 62oqrHAmpGbGV+Q7S84Rkdo93bc5LW9UPivluF+TXPlWcRir6jFUFOJe32mX4djK TRlfxI6O6huImun//tAARm/wppP5xdKGJqUaSEdwuqmBFBAGvbngghJwD1dfxRs9 NCN4R7faefywvbrqCrGwhvcREpfA1jOZ4ux1JTkUJKfrkljTR9r4s1DC+mCGWrpd 6Ogi0XVE57kXTQIJlP4p5MWskv8BJ3CvX4fRyRU2uZF4cdeaQ5hbnH3bEVMgrjkj WeWPgg+Eku6u3CA2bg4RMmorUsUitnqa/r7bED0K+7gs83nRrXMUB/geV81t1yem qonzj4dYCgY776u96WBcqyWpnyqRtQnqO5sjPR2QW4pGXivFPsl8+pQVP27rRC26 T6lch4a0Q9iAxXvzwpUiSQaqNb2tbTHDeKjl88PyAjwLQU8Y6gU9vxmAjAGenXIz ziFSFwK5MIeMk15M1pK7wYOwpAi/5qzEY3kM65whzPEKkiL4jMs= =fZrf -----END PGP SIGNATURE----- --==-=-=--