From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: Re: [PATCH] gnu: Add fpc. (version 2) Date: Mon, 05 Jun 2017 15:42:53 +0200 Message-ID: <87inkay2hu.fsf@fastmail.com> References: <87poj9xwzp.fsf@openmailbox.org> <87lgtxxial.fsf@openmailbox.org> <87efzpxfxh.fsf@openmailbox.org> <87a8adxct0.fsf@openmailbox.org> <20170314224527.7bee1241@scratchpost.org> <87mvcfg1nv.fsf@elephly.net> <20170605152024.732db174@scratchpost.org> <87lgp6y2ws.fsf@fastmail.com> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57549) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHsHc-0001Pi-Sr for guix-devel@gnu.org; Mon, 05 Jun 2017 09:43:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHsHZ-0002Bd-QV for guix-devel@gnu.org; Mon, 05 Jun 2017 09:43:00 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:39339) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dHsHZ-0002A2-6S for guix-devel@gnu.org; Mon, 05 Jun 2017 09:42:57 -0400 In-Reply-To: <87lgp6y2ws.fsf@fastmail.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Danny Milosavljevic , Ricardo Wurmus Cc: guix-devel@gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Marius Bakke writes: > Just to piggy-back on this discussion, I'm attempting to package > "Hedgewars" and needed this patch to get fpc working properly: Oops, found one more patch in that old branch. @Kei, feel free to squash this into the original patch: --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-fpc-Patch-bin-sh-reference.patch Content-Transfer-Encoding: quoted-printable From=20cb94a2c4c697541183cb912039399df54ece5ec3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 24 Apr 2017 21:37:13 +0200 Subject: [PATCH] gnu: fpc: Patch /bin/sh reference. * gnu/packages/pascal.scm (fpc)[arguments]<#:phases>: Add new 'patch-inline-shebangs' phase. =2D-- gnu/packages/pascal.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/pascal.scm b/gnu/packages/pascal.scm index 0e7b9f3ab..a343ddcd6 100644 =2D-- a/gnu/packages/pascal.scm +++ b/gnu/packages/pascal.scm @@ -106,6 +106,11 @@ fpcmake-tarball)) (zero? (system* "tar" "xvf" compiler-tarball "-C..")) (zero? (system* "tar" "xvf" fpcmake-tarball "-C.."))= ))))) + (add-after 'patch-source-shebangs 'patch-inline-shebangs + (lambda _ + (substitute* "fpcsrc/compiler/script.pas" + (("#!/bin/sh") (string-append "#!" (which "sh")))) + #t)) (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) (substitute* "fpcsrc/compiler/systems/t_linux.pas" =2D-=20 2.13.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlk1X94ACgkQoqBt8qM6 VPqY5wf+PL5IAGUvw9FYtZrleBf4CFGb1Ufphi0oIieVNrX0u/XUsAIe/1OUO4D9 TPZBse7JwuGuSuBWy/kaZZB63RD90wuMgQYvDP3uFL3W/sjiuCqoP9HVkjYcdAIt ENxYEBeJ2Xaw/xhUIU6sWvx12G6xY18OfunEtnz+BFwJ9+rxaSBaVNOVTInI+VhX g90l32zZvzIyw66axoef4DQAEHhQe8t7zdrNdDyvWoxdtleTJiJ9C32kVvTH2JRj cjgyemf1GrbKLcrMaK0lxWaciLKVw9v7g8elNN2H6evZj3cZoUCUu4/3v+HtGqnw UQnvzj+HeRldRWQ9S9oeXh+x8EhtaQ== =qW3W -----END PGP SIGNATURE----- --==-=-=--