From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id YDP1OjLnVGEZKAAAgWs5BA (envelope-from ) for ; Thu, 30 Sep 2021 00:22:42 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id eL2iNjLnVGG1CgAA1q6Kng (envelope-from ) for ; Wed, 29 Sep 2021 22:22:42 +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 84EDDDF94 for ; Thu, 30 Sep 2021 00:22:42 +0200 (CEST) Received: from localhost ([::1]:48304 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhyJ-0001vI-VE for larch@yhetil.org; Wed, 29 Sep 2021 18:22:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44576) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwu-00079G-TC for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39196) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwu-0002C6-Il for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwu-0000lX-Ek for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 33/38] gnu: heimdal: Make some parts of phases unconditional. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540342633 (code B ref 50905); Wed, 29 Sep 2021 22:21:12 +0000 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:34 +0000 Received: from localhost ([127.0.0.1]:50699 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwH-0000gI-V5 for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:34 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36330) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvj-0000Za-1X for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:04 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKyST; Thu, 30 Sep 2021 00:19:58 +0200 From: Maxime Devos Date: Thu, 30 Sep 2021 00:19:33 +0200 Message-Id: <20210929221938.17168-33-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953998; bh=C741vQZeiyfLswNMZ93oGojZZxOECaQbr8Dy+JElW1w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=QmlrXX3m/Bnzep0djOUAC5/bdjVpTYnpxrLCR47avQMzy10CbJ4jkTIefIiyVMO3v 5vin+a1IfNfHzW4RsmLe5lLvO/juFC258vtZHf4q+Z5AVVjB3tcz4wJCq/x/8BrjGD tfu7OZ1pl/BeBse/4Oofp2n9RsLzhVq26aLFL8+ytizWeypNDuf1FzG3T3x7bn0N7V SCQbevor4lCL2c+3ey4wnq4lcqs0NLAE1UApzjpV/dC7F1CfjJmgnj8ai0jU/BeZk2 /qK0QaYXFX6gRS+D/iJYFcUUX1x4nNY4TWqnCoMPt2EgXP4+tAAMN/uhqviDt4SoyL McennXzraNdOw== 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=1632954162; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: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=C741vQZeiyfLswNMZ93oGojZZxOECaQbr8Dy+JElW1w=; b=oOJJ4fHVLT7qVWt6pqLr09tlqQbyk8NIxISWdnEC1zl1F9qU+NmFwEJYgvBO2pN0AnCwG7 r90/8sp7pxZHuCkID4xE83G54+3r7ELi8NCJBxeOlWWOAyZF0liKB/2+lsvXaDKp9B4ozR EY4OeDP/qHngcsaNEvsUp6ZPYQY80MTFzjmZUDEi3CKdr1N6SqNLtAr9Z8/DX6UZemnGGK sLaCFtd/xEQ5hZI7YLCzDea+owF5hltg4SHwp0RbRjLv/rLBxzlG0jYHK0jsiC4jHJIyf6 X9MXiSHn+isE6GQfusWzFmhU2IClcsgcpRU8g3Zt6jTh9gqZHf9tlMpyP0F3Bw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1632954162; a=rsa-sha256; cv=none; b=dIJFLWir/w7fL1eWUiI2LSKV8sZx8+0+bB62SCAtCX0CMCrJBvVNNMVu8uFvGwD/WRECHg eHKsz4ph1m6DfAmG7crJwqTAjeXv1tQpwYo2qFm+1vluw/1waRJssGK3TWOD7gvSk/vX7F 0bJxa3Cv9NrGd6KCQYG6aTjEChUqPFgW6u1FxqxbqkTpJyA71E3FvEYnVYxqcmr25uYuNq Q9IECnVOIz3ZP4WbQOv7yCQwNa0j9Nfms1WI2kwkefCd+QwyCTNj+W20W2Fj/imn9Zd87n VKCblflHTMiNgWOaY03LVK4ttIynAqVk60wu2Hye8R6fYXAkuzho4uqN3DPFQA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=QmlrXX3m; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (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: 3.70 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=QmlrXX3m; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (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: 84EDDDF94 X-Spam-Score: 3.70 X-Migadu-Scanner: scn0.migadu.com X-TUID: 7DjJvOoIOfHG * gnu/packages/kerberos.scm (heimdal)[arguments]<#:phases>{pre-configure}: Make the '(%current-target-system)' branches unconditional. --- gnu/packages/kerberos.scm | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 82609ce66e..6bfb758900 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -237,14 +237,7 @@ After installation, the system administrator should generate keys using #~())) #:phases (modify-phases %standard-phases (add-before 'configure 'pre-configure - ;; 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) - '_) + (lambda* (#:key inputs #:allow-other-keys) ,@(if (%current-target-system) `((substitute* "configure" ;; The e2fsprogs input is included for libcom_err, @@ -256,22 +249,17 @@ After installation, the system administrator should generate keys using (("ac_cv_prog_COMPILE_ET=\\$\\{with_cross_tools\\}compile_et") "ac_cv_PROG_COMPILE_ET=compile_et"))) '()) - ,@(if (%current-target-system) - '((substitute* '("appl/afsutil/pagsh.c" "appl/su/su.c") - (("/bin/sh") - (search-input-file inputs "bin/sh")) - ;; Use the cross-compiled bash instead of the - ;; native bash (XXX shouldn't _PATH_BSHELL point - ;; to a cross-compiled bash?). - (("_PATH_BSHELL") - (string-append - "\"" (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)))) + (substitute* '("appl/afsutil/pagsh.c" "appl/su/su.c") + (("/bin/sh") + (search-input-file inputs "bin/sh")) + ;; Use the cross-compiled bash instead of the + ;; native bash (XXX shouldn't _PATH_BSHELL point + ;; to a cross-compiled bash?). + (("_PATH_BSHELL") + (string-append + "\"" (search-input-file inputs "bin/sh") "\""))) + (substitute* '("tools/Makefile.in") + (("/bin/sh") (which "sh"))))) (add-before 'check 'pre-check (lambda _ ;; For 'getxxyyy-test'. -- 2.33.0