From patchwork Fri Jun 18 16:09:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30385 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 1FC5227BC81; Fri, 18 Jun 2021 17:15:09 +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 DC21B27BC78 for ; Fri, 18 Jun 2021 17:15:08 +0100 (BST) Received: from localhost ([::1]:48246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luH99-0007ud-Vf for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 12:15:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51918) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luH5I-0000Sz-Qp for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46297) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luH5I-00028a-Fh for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luH5I-0002zG-BH for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [[PATCH v2 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: Fri, 18 Jun 2021 16:11:08 +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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162403264411219 (code B ref 49025); Fri, 18 Jun 2021 16:11:08 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 16:10:44 +0000 Received: from localhost ([127.0.0.1]:57793 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH4u-0002un-7F for submit@debbugs.gnu.org; Fri, 18 Jun 2021 12:10:44 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:49896) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH4X-0002rE-MH for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 12:10:22 -0400 Received: from localhost.localdomain ([188.188.242.184]) by baptiste.telenet-ops.be with bizsmtp id Jg9t250053zRM2s01gAMNq; Fri, 18 Jun 2021 18:10:21 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 18:09:20 +0200 Message-Id: <20210618160936.18972-21-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618160936.18972-1-maximedevos@telenet.be> References: <20210618160936.18972-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624032621; bh=vhZXOsCczCO429r2Yoc9TLnkfRn6IvuUP6kheXL3cLo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=FSjZvgepbDo1DxjiVNTzZaj92BDTMUMwsQjdWqML9USxD4Wc8PlQjoU6z+B0mHHb6 GY3t2g26GLXycqNneZzm/BbnjggRBxtufc7V4yRpxKcQTjR32mw7nvospU2bNSTgoG +VevQ4XuNruj1lQbU6N0gPqghvudGdr8QU1kKchPJB0u5DWcpMHBI6muAcEfh/6kzt otQ+yG07yHshyC90NWqtfuYgIvIJSHUV9W71uNWSMe/bYTqY2hC+oOm1BkFo3DU5gg 7ESUoJQmO7Ah0tKCKL3j6S8jZpFlnH0jQhbnQ53RZ5fUCPvtL7aXy1Sfkny586u48x kJsG1M4k2TDFw== 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: , Reply-To: 49025@debbugs.gnu.org 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"))