From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id JNOFC9MaV2FKFQAAgWs5BA (envelope-from ) for ; Fri, 01 Oct 2021 16:27:31 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 2GKWBtMaV2GhbAAAB5/wlQ (envelope-from ) for ; Fri, 01 Oct 2021 14:27:31 +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 EB1FBD29D for ; Fri, 1 Oct 2021 16:27:30 +0200 (CEST) Received: from localhost ([::1]:46032 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJVa-0003xy-2t for larch@yhetil.org; Fri, 01 Oct 2021 10:27:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUL-0002Bt-Bz for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45433) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUK-0000cw-7Q for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUK-0005il-51 for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 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: Fri, 01 Oct 2021 14:26: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309832121737 (code B ref 50905); Fri, 01 Oct 2021 14:26:12 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:21 +0000 Received: from localhost ([127.0.0.1]:56947 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTV-0005eR-B6 for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:21 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33350) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ7-0005Th-Ko for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:55 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMrMr; Fri, 01 Oct 2021 16:21:51 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:35 +0200 Message-Id: <20211001142140.17027-33-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-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=1633098111; bh=C741vQZeiyfLswNMZ93oGojZZxOECaQbr8Dy+JElW1w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Xk/OsmiT2KIRH19Dzh3+sdvPHVokltJMLuR4TY85ICrGb3dApvtJ2Dh/Fu8dkOHiE yDD8MfG9HanbVBLKfQUoAy7rDjTWlrgIS6Ly4Wk8Crz3v/GZ0fmHROfEpCq+eFc0pQ G/A/ei778zyloKnjkRw66g92ucYHtiQrNyRJhf2UpLsDwYNmRoDLQ8z1PjJzWuGpv9 msob0S9s6IAk4B/tJd0KbRsZD0R1O31SSHhJvJoiB/5cThkzrHQIGrcr9FG8y8VJeh rW0kjZCJs57FbbIZFetiMiXO+t1A25TbGagx4R48Ta5Zim0q0M7PUyT/N95K3yZ/Tx ZDny2+aO6p39g== 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=1633098451; 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=ZTxjos+LOpOX6tmvRNcUCNqkfKY81FIb9b+pEQFuKbGt7os04Bx3JCkL+seePaOK4j2BJP aQlcp1Gd0wkFsLSvsMa4bmPgC6xM9ZqfLnFgFD2jQLeIR9CHc9kWW2GFYlVUhorCy36/SH o+vM1QZ1S34PswazLGsh0Bw4BDFI6tsfdz2wkS/q0Jg2t+DzexCz2zRI5gEOrtcgKJ2pfo PXuy3OLyz5CXbtU9A3jYgdVIp1KaYxCXc3jC7ifxMf+oZRFr6Yb8GDB1XGRfYm/BDGUuav OXDL9Ca6d4xO4AI6BKC681pg2XR7sA320oUL9rttTAkhs2ZmthZboOeZm8NajQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1633098451; a=rsa-sha256; cv=none; b=EUdJUTbAb6XO+bkpNIOwBQJofYLZ0niMovWZeRvQA6WZdpPm/N7i5gIhvJOsCci0j+k/U8 ScJm6TooOqhQodlkwQd1SS0lIYW6V/qGwHyJV2EcKTrDwF7mP+Vvl4dc/IMRVUSmKhY91x puz4vLta6fxH02sekkxUyMR9rKboCiOmOWCxoX/tux9GDUSNelofTlA/ORL2nsH0B6tFYr aC+m8QAzr0ombV9syWg7HVzm+hU25wg1yT4SzkcjMqVdZolgqoXBywy0/kqszvOF9hracU /XSeBV1Z05p+3expA8gIaRQe+ZagiJL2xySREI5lQBUVQYkeMSZbwkR+S5Co7Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b="Xk/OsmiT"; 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.20 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b="Xk/OsmiT"; 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: EB1FBD29D X-Spam-Score: 3.20 X-Migadu-Scanner: scn1.migadu.com X-TUID: mlFwe7OGWj4J * 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