From patchwork Fri Jun 18 17:16:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30422 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 E9BC727BC81; Fri, 18 Jun 2021 18:21:43 +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 9605F27BC78 for ; Fri, 18 Jun 2021 18:21:43 +0100 (BST) Received: from localhost ([::1]:51376 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIBa-0000ri-9M for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:21:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37756) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIA8-0007tI-6B for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46560) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIA7-0004EQ-RC for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIA7-0004ts-Me for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 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 17:20:11 +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.162403676918520 (code B ref 49025); Fri, 18 Jun 2021 17:20:11 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:29 +0000 Received: from localhost ([127.0.0.1]:58052 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9Q-0004oX-TT for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:29 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34838) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9C-0004j5-9e for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:14 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKDd3; Fri, 18 Jun 2021 19:19:14 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:15 +0200 Message-Id: <20210618171631.20534-21-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036754; bh=vhZXOsCczCO429r2Yoc9TLnkfRn6IvuUP6kheXL3cLo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=fEsAQGTTL0ENKW1HHYcd0DK4vANAKzYWbABBLwUwvrKYSLh66uR4zTQ0AWyZ1QHN1 nBSN9dF5hB8CNr2g8e7zC034rpV4AINEo4zsYi60Donrxl26PDJvID9BgYzZH0VRSE pG2ThQXXcGuCbAAXgpupGmgPt4YJHiBobOTO6mu7aWkbb3uR4Xuo28yoqad8i0/gnP UV9XjOMd2cAdFF9LLVfkk/nNy1QGkKYX3uOTPXFFTjQRhiX19TA0hoO/xddxiscILQ H8e0SvtTnIDIsQGqL8uwK6fF4GaUR5wsxuwasEx8SVUhREeZlayoE2KEnZJiK+wLPX HotXRDUK7A5aA== 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"))