From patchwork Mon Jun 14 15:38:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30255 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9D72B27BC81; Mon, 14 Jun 2021 16:57:39 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 72EC427BC78 for ; Mon, 14 Jun 2021 16:57:39 +0100 (BST) Received: from localhost ([::1]:57124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsoy2-0002VO-IR for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 11:57:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54482) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsof9-0000BF-Jg for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36014) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsof9-0007Ay-9C for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsof9-0004FE-7Y for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 21/37] openssl: Find bin/env when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:38:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368508516295 (code B ref 49025); Mon, 14 Jun 2021 15:38:07 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:38:05 +0000 Received: from localhost ([127.0.0.1]:47556 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsof7-0004Eg-Jz for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:05 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:41494) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsof5-0004AR-Qa for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:04 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id H3e32500C0mfAB4063e3xw; Mon, 14 Jun 2021 17:38:03 +0200 Message-ID: <4dd136f941566e2aec0e86121a40cb2d38952d38.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:38:03 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685083; bh=uCLyFHAdGzsxq1oiuobOF0Zs8lLgSM/ioa9UNVIbOb8=; h=Subject:From:To:Date:In-Reply-To:References; b=jU69cewSYlwaauhp5cQK0SN6Ni6KtMK5W55hl5jfs9shF0Ww4w2tWQ9k2rC/iqPnc kpY6hcr7n5sFc8f2kpYFZ7ZXVAj3PH95B5kTUnxmAcyldAma5bjQ2RpwzVsmD0IPUf myXiAnb2uTwl5zl2LLzNpVv/9a8+x0SSZalNNCRD1G0koT2LWQ28umcpT5gPzDmq5A BbDASFUBMyy/18a9qJnFP3X+MEmIzZ+ILSh3tAtEzRbBSnfc8Z340MLG6fi50kBKol I/u8Sx8Tq8qRhy3kfsUCAVFIzNOvyMvpL4kzzHnULgXt0yKBecoLMPKY/0poFuKNR5 q7wmbSwVJYQOw== 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches %build-inputs does not exist when cross-compiling, so find bin/env by another way. * (openssl)[arguments]<#:phases>{configure}: Don't use '%build-inputs', use 'which' instead. --- gnu/packages/tls.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index c178806805..a4e754e27f 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -376,10 +376,10 @@ required structures.") (let* ((out #$output) (lib (string-append out "/lib"))) ;; It's not a shebang so patch-source-shebangs misses it. + ;; Don't use (assoc-ref %build-inputs "coreutils"), as + ;; %build-inputs is not defined when cross-compiling. (substitute* "config" - (("/usr/bin/env") - (string-append (assoc-ref %build-inputs "coreutils") - "/bin/env"))) + (("/usr/bin/env") (which "env"))) (invoke #$@(if (%current-target-system) #~("./Configure") #~("./config"))