From patchwork Wed Aug 25 18:03:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 32275 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 D893527BBE3; Wed, 25 Aug 2021 19:06:01 +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_H2,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 7E46527BBE1 for ; Wed, 25 Aug 2021 19:06:01 +0100 (BST) Received: from localhost ([::1]:33132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxHk-0003Oq-KC for patchwork@mira.cbaines.net; Wed, 25 Aug 2021 14:06:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58524) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIxG1-00087C-3q for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36190) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIxG0-0000wD-Or for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mIxG0-0002pc-Fb for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH 25/52] gnu: heimdal: Refer to cross-compiled bash. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Aug 2021 18:04:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50201 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50201@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50201-submit@debbugs.gnu.org id=B50201.162991464510751 (code B ref 50201); Wed, 25 Aug 2021 18:04:12 +0000 Received: (at 50201) by debbugs.gnu.org; 25 Aug 2021 18:04:05 +0000 Received: from localhost ([127.0.0.1]:47717 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFs-0002n9-N1 for submit@debbugs.gnu.org; Wed, 25 Aug 2021 14:04:05 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:55666) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFa-0002hp-I0 for 50201@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:47 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id lu3k2500G0mfAB401u3l8w; Wed, 25 Aug 2021 20:03:45 +0200 From: Maxime Devos Date: Wed, 25 Aug 2021 20:03:05 +0200 Message-Id: <20210825180332.5720-25-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210825180332.5720-1-maximedevos@telenet.be> References: <20210825180332.5720-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1629914625; bh=WXg62Z8NNtJF4sxT7b+H4yfjenyyJiQ7n+JBELCz2e4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bqu1GKU+J9em9jCTb+Ok7gEfnmbFZ+P3AdkeAxY8zvUvBwp+tYn5Q0lAYYoJoGYMu GnSPSA/+AQ4U5LAkw5/i9hEIhiQY+OhmfhNEAFWnPuWLOAiowm+1+V7IGK8RIFHsvJ ZgD1VSTKx9v0N7bnx2L+DchFH4tWlVa4QfJdzuukSC6uU4OqMsuTLRDoFBM+/OU8iT sLSbbQkH7jJIRyzXWXsiJtGmzbXCOO2iV3DzFbNx5qXVvERYNuxO7IDXdRtniiehzv bxGhBNNNfwgXaQLrYecX2u8t+H0jNzSClQvAj8ka6wgfVCYZGDMilS1Z2NIb9XNqos oh6S2Is6J16gg== 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 * gnu/packages/kerberos.scm (heimdal)[arguments]<#:phases>{pre-configure}: Let "appl/afsutil/pagsh.c" refer to the cross-compiled bash instead of the native bash when cross-compiling. --- gnu/packages/kerberos.scm | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 54dd5dffc1..9afc6a363f 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -231,11 +231,24 @@ After installation, the system administrator should generate keys using '())) #:phases (modify-phases %standard-phases (add-before 'configure 'pre-configure - (lambda _ - (substitute* '("appl/afsutil/pagsh.c" - "tools/Makefile.in") - (("/bin/sh") (which "sh"))) - #t)) + ;; TODO(core-updates): Unconditionally use the + ;; %current-target-system branch. + (,(if (%current-target-system) + 'lambda* + 'lambda) + ,(if (%current-target-system) + '(#:key inputs #:allow-other-keys) + '_) + ,@(if (%current-target-system) + '((substitute* '("appl/afsutil/pagsh.c") + (("/bin/sh") + (search-input-file inputs "bin/sh"))) + (substitute* '("tools/Makefile.in") + (("/bin/sh") (which "sh")))) + '((substitute* '("appl/afsutil/pagsh.c" + "tools/Makefile.in") + (("/bin/sh") (which "sh"))) + #t)))) (add-before 'check 'pre-check (lambda _ ;; For 'getxxyyy-test'.