From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60293) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRtPV-0004TY-Sh for guix-patches@gnu.org; Sun, 10 Jun 2018 02:01:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fRtPS-0002cU-OY for guix-patches@gnu.org; Sun, 10 Jun 2018 02:01:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:33806) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fRtPS-0002cQ-Kg for guix-patches@gnu.org; Sun, 10 Jun 2018 02:01:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fRtPS-0006Ju-6E for guix-patches@gnu.org; Sun, 10 Jun 2018 02:01:02 -0400 Subject: [bug#31678] [PATCH 1/2] gnu: erlang: Patch occurrences of /bin/sh in the source. Resent-Message-ID: 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> <87wov7gsnj.fsf@member.fsf.org> Date: Sun, 10 Jun 2018 14:00:07 +0800 In-Reply-To: <87wov7gsnj.fsf@member.fsf.org> ("=?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?="'s message of "Sun, 10 Jun 2018 12:41:20 +0800") Message-ID: <87in6rgp08.fsf@member.fsf.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: Christopher Baines Cc: 31678@debbugs.gnu.org iyzsong@member.fsf.org (=E5=AE=8B=E6=96=87=E6=AD=A6) writes: > Christopher Baines 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. T= hese >> changes fix that issue. >> >> * gnu/packages/erlang.scm (erlang)[arguments]: Add new patch-/bin/sh pha= se 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! Oh, =E2=80=98substitute*=E2=80=99 does return =E2=80=98#t=E2=80=99 itself, = never mind :-)