From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id SIlfLtTvE2GYHwAAgWs5BA (envelope-from ) for ; Wed, 11 Aug 2021 17:42:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id uA1RKtTvE2FgGQAAB5/wlQ (envelope-from ) for ; Wed, 11 Aug 2021 15:42:12 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1DEA218A72 for ; Wed, 11 Aug 2021 17:42:12 +0200 (CEST) Received: from localhost ([::1]:56996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mDqMs-0007zp-H8 for larch@yhetil.org; Wed, 11 Aug 2021 11:42:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58662) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mDqMk-0007xS-F5 for guix-patches@gnu.org; Wed, 11 Aug 2021 11:42:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53028) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mDqMk-0008Ou-6o for guix-patches@gnu.org; Wed, 11 Aug 2021 11:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mDqMk-0002fm-35 for guix-patches@gnu.org; Wed, 11 Aug 2021 11:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH 08/31] gnu: node: Patch /usr/bin/env in node-gyp. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 11 Aug 2021 15:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49946 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos Cc: Pierre Langlois , 49946@debbugs.gnu.org Received: via spool by 49946-submit@debbugs.gnu.org id=B49946.162869648910229 (code B ref 49946); Wed, 11 Aug 2021 15:42:02 +0000 Received: (at 49946) by debbugs.gnu.org; 11 Aug 2021 15:41:29 +0000 Received: from localhost ([127.0.0.1]:36341 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mDqMD-0002ev-4e for submit@debbugs.gnu.org; Wed, 11 Aug 2021 11:41:29 -0400 Received: from mout.gmx.net ([212.227.15.15]:49193) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mDqMA-0002ea-VE for 49946@debbugs.gnu.org; Wed, 11 Aug 2021 11:41:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1628696480; bh=Lsrv4b6mBynTuyJNjjgkxmDKkXH5vvuYvTaacJ3lKt8=; h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to; b=MPI4SYAnopJFcpmTnGhtBTQBjZuSIOM9fz3ybWS2gFy94tT/SIPsV1cjqPdtAHuNR KYN3IhmfJGLM2fQmKg/k6lVOeX5Il0xWXED2NMwX4l0uMGUCaGuEvNuGWyuEhzb3wC JBVXYwTi6xyuYkei4YmLEWHjQwWU5Qu4X9l2Ewpg= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx004 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MhD2O-1mhy780Sjy-00eLqb; Wed, 11 Aug 2021 17:41:20 +0200 References: <87h7fztt60.fsf@gmx.com> <20210808233354.6745-1-pierre.langlois@gmx.com> <20210808233354.6745-8-pierre.langlois@gmx.com> <42e10baddb6afe308f67c3240bf5da8159e6f118.camel@telenet.be> User-agent: mu4e 1.6.2; emacs 27.2 From: Pierre Langlois Date: Wed, 11 Aug 2021 16:36:11 +0100 In-reply-to: <42e10baddb6afe308f67c3240bf5da8159e6f118.camel@telenet.be> Message-ID: <87czqkng4k.fsf@gmx.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Provags-ID: V03:K1:hN6Z+7K84/ahH5ttBuqycrLwlP6XDiUA9Pt3PVnv2EvGvcPHGVM vBbD9sr2PkVuzFf51cTr+nEP0wGeVLdVWXLF560VH86hdD6gBse5lfA3JaHkjemXVu/18/r r0abEo2rT0+ScsxWf/O8Ziwy8/Jbf7Fu1HoT2gXWIZyDSGw5zRIaolTu/dun76ABCQnH7TO l3/BDTTHN3z9bSdqLidNg== X-UI-Out-Filterresults: notjunk:1;V03:K0:Hqif4NCGYdc=:+hxaBvrkMUKAzvyTsBnjwv fcIO9Ej9NK3JMugWcN8czT3+9BXfKiErIgo+qcUcozYED2Nw+w3CsuW3o9TZA++RkjrHnyWvf y9vDg+wf7krnkRhoxRGTLd/75+7kdulZ9zV+ETrDDnyS2zz6mH4r3ihjxlB3yeT/ubQ0NX1YA Jd7/VTeaCIs9tYPSoaG/Y6lLvBN2AZqcUqv9ALuqZKxC290NQndPBqIyvYCcg+X9IHHXXV/2F aFZHr+OWJcywHn22D/g+Bsoc1u/mcM2WxkYdCS+dHeYZjCGZ1LQPRs+iHKeuB7EUHvn4vJLsG y3T7ZyghWbYmi7zOapqZ0vPICE31/5fzOIMuf3nv3naXCOG31Gk4JI5ZLxfIcnNHcVarvB2l1 EDVJboLUfJg9Xz6FgPhTDlARhjc6PtAV9glxK7GUWETNKw2+grTgUJW/8wkc7C6PjWoL2Lrez D+r3FQAb+B2ZBDbupw7hTTBuFvCka0yNjVwFjOptS35Ktm79cIppqZHtV77U42hK78ACg54+B yQgZH0v/cvBo/xoC9IN5bcR029AvwUztKPfqFt4F9WK9GpK1U/KjP2lAWiR0nWwbf7BXvHj8A +dvhenIaHlZ2qgLG/wKXbKStYpX6CguTjmzjmYd/tlkQ5AUQyN+0W/IAKCjf8v8vi5crlaIUI Kh7UYl4pId07PVnt5Gmc/XxMmWYM/y+l7icIR03UFyXN2dtXeQ59BykkxGlqISEucVxQIzHOM UK7iZhS37gJTxv41DE/3O/ECG409PjhEAU1702KzJK87/LecBztVZNTk/u0D/9rOrxbEIEehi 3QVwGpje9+ab3rvTH8TvT0bZ3xhCHCcUcX8LGKxedhR/Eg7YMxlgE2Lj6Th/PJcvihITAFOtA ZQhUIevp0ZnSemVsyCKVJRXrzuwsQgQ6kyt95SZX6vFdmpDcQL49MmFaayAMwv/o0raXE2jL5 sxZ3j9X8Vfx30yahGFzV3Bd/NbiMdlJY9nITCFF1Gbc5bjHQEJqAMZB9VwIF0phTAXT+QkE0c 83Cut9Xz44JzYgT/xgJLk1xjuk6Wi4VKFS0Sw8mFSJlC3t2B3VQVRIZTHHC8jAsJ+Es/+Hv0h Ae36uD//V94R9JHbh9esd7lpmAeiNnhTgW+ne1xWTskPN7ML+SOyJozKw== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1628696532; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=Ityhp0aGnCUYki1VKPQM1c866y7WS8RnKe19rTfBdWo=; b=MNRMf11NnXCymxeD2dcD1klXS5XINH1C8W+Ev4WdC/BqlBLEz2dTdGGw39KlshltD35HPH PUpS96OH9blobSTaRi+abznEKSP+N2kB3YdxR+xOWP0TwT/irgwJauEyR9wPHSiNo94FDM PK2LdxFJOlJBIF6ieqXcx1B/NKeSYdD3fyJ9bLT6/27LFNxBobVRpUkh1GH3t/jjmr6+Lg FpdyNB4fiaSDydbgn2TUpRacRrjGUA5UkWlkoX2vytyNDN3eH1gX+wSbN1Lj4dcpt2z1fQ d7w0DvzJ7KxOe7l/ZEhKjbeyM7oYwRzY9xNGOnH12YWPq2AuHjTHnecUNB031w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1628696532; a=rsa-sha256; cv=none; b=X7Xr71vJWQ29Ve0E77/t/sgw8aIbs/slqKdUUml41TfSjGrTRu3H9pzmixIcRYpgPwtKCc +IBBzWkWx+HY6+Rz4P7uOICkvC9NkRqZshpOn1KvpTFfUiJCJBI3q8OE5M1LDIARm6t5Pe XtJBW5MRwdALsqG2xzjOfps7s4EgoLowWficx+w4ITxFq0omVqH1fOPFanbUuuHMgXex4/ 5mYWVhe/t/PsNtZ8R+okg2+8mMAkcecPpblfjmT0oolRh0nueIDh1Yytzi3eH3ofqmrSMA gy2YSbz1rHzH9SRdVN4hVpJr0nptImoq18gxQy3mueHJenqUgODkaulMbMgKmQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmx.net header.s=badeba3b8450 header.b=MPI4SYAn; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmx.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.91 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmx.net header.s=badeba3b8450 header.b=MPI4SYAn; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmx.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 1DEA218A72 X-Spam-Score: -0.91 X-Migadu-Scanner: scn0.migadu.com X-TUID: JWXJdR5npFHy --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi Maxime, Maxime Devos writes: > [[PGP Signed Part:Undecided]] > Pierre Langlois schreef op ma 09-08-2021 om 00:33 [+0100]: >> @@ -120,6 +120,10 @@ >> (("'/usr/bin/env'") >> (string-append "'" (which "env") "'"))) >>=20 >> + ;; Fix /usr/bin/env shebang in node-gyp. >> + (substitute* "deps/npm/node_modules/node-gyp/bin/node-gyp.= js" >> + (("#!/usr/bin/env") (string-append "#!" (which "env")))) > > For cross-compilation, this should most likely be > (string-append (assoc-ref inputs "coreutils") "/bin/env") > or something like that instead. Likewise in other places. > The old code uses (which "env") in some cases, but those > are probably wrong (except where it is patched in tests). Good point, I didn't consider cross-compilation. Actually, trying it, it looks like our node package doesn't currently cross-compile correctly. I just managed to get it to cross-compile though, I'll submit another patch for it! In the meantime, with this series I agree it's better for the new code to be correct from the begining though. Thanks for taking a look! Pierre --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmET75sYHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31U65EH/1viouDCu3YEBTff3X725srp +kf8oKFE4Vl/cE2uR8Gqolj4ldjYKYiYrf/Mhz5oM4+N2LqaJjaxcs+3dRXV8NrS 51CYHzWmhPu4kMf3LaetK3s/kjauDME80EHaOYDiH9aZn2h6D4QOmHbA/Xs7Oct+ 2Ntoz356uMaD6jzluK1ljCmLQyew4TnlnaOzzF4MzJ6mE98noT6MAiMZyWmf7aXv ax6Zr6f+hJc83TiUAN6hKX4hc/sIGv8c9MwCepNeZZGQHeJvAiw223bIfClXlIPJ 2NPTab5FQ0ypbpDhmmhoZ787yS3SRp18mJuC/PblI9l5WZHd+GR2Bue7kXdl1vY= =YsOg -----END PGP SIGNATURE----- --=-=-=--