From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:53176)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1fRsC1-0003NL-NP
	for guix-patches@gnu.org; Sun, 10 Jun 2018 00:43:06 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1fRsBy-0002QL-GU
	for guix-patches@gnu.org; Sun, 10 Jun 2018 00:43:05 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:33774)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1fRsBy-0002QE-CH
	for guix-patches@gnu.org; Sun, 10 Jun 2018 00:43:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1fRsBx-0004As-Vm
	for guix-patches@gnu.org; Sun, 10 Jun 2018 00:43:02 -0400
Subject: [bug#31678] [PATCH 1/2] gnu: erlang: Patch occurrences of /bin/sh in
	the source.
Resent-Message-ID: <handler.31678.B31678.152860572315971@debbugs.gnu.org>
From: iyzsong@member.fsf.org (=?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?=)
References: <87o9gumxgd.fsf@cbaines.net>
	<20180601135106.32680-1-mail@cbaines.net>
Date: Sun, 10 Jun 2018 12:41:20 +0800
In-Reply-To: <20180601135106.32680-1-mail@cbaines.net> (Christopher Baines's
	message of "Fri, 1 Jun 2018 14:51:05 +0100")
Message-ID: <87wov7gsnj.fsf@member.fsf.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-patches/>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: Christopher Baines <mail@cbaines.net>
Cc: 31678@debbugs.gnu.org

Christopher Baines <mail@cbaines.net> writes:

> Previously, the elixir package would often fail to build, as running :os:=
cmd
> would fail, as /bin/sh doesn't exist when building the elixir package. Th=
ese
> changes fix that issue.
>
> * gnu/packages/erlang.scm (erlang)[arguments]: Add new patch-/bin/sh phas=
e to
> replace hardcoded references to /bin/sh with a file in the store.
> ---
>  gnu/packages/erlang.scm | 21 +++++++++++++++++++++
>  1 file changed, 21 insertions(+)
>
> diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm
> index 0e2b7b5bc..1fce57388 100644
> --- a/gnu/packages/erlang.scm
> +++ b/gnu/packages/erlang.scm
> @@ -127,6 +127,27 @@
>                    (date->string source-date-epoch
>                                  "{H,Mi,S} =3D {~H,~M,~S},")))
>                 #t)))
> +         (add-after 'unpack 'patch-/bin/sh
> +           (lambda _
> +             (substitute* "erts/etc/unix/run_erl.c"
> +               (("sh =3D \"/bin/sh\";")
> +                (string-append "sh =3D \""
> +                               (which "sh")
> +                               "\";")))
> +
> +             (substitute* "erts/emulator/sys/unix/sys_drivers.c"
> +               (("SHELL \"/bin/sh\"")
> +                (string-append "SHELL \""
> +                               (which "sh")
> +                               "\"")))
> +             (substitute* "erts/emulator/sys/unix/erl_child_setup.c"
> +               (("SHELL \"/bin/sh\"")
> +                (string-append "SHELL \""
> +                               (which "sh")
> +                               "\"")))
> +
> +             (substitute* "lib/kernel/src/os.erl"
> +               (("/bin/sh") (which "sh")))))

It should return =E2=80=98#t=E2=80=99, otherwise look good to me!