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 gATMLHWGJmFMmwAAgWs5BA (envelope-from ) for ; Wed, 25 Aug 2021 20:05:41 +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 QIZhKHWGJmGhdQAAB5/wlQ (envelope-from ) for ; Wed, 25 Aug 2021 18:05:41 +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 638FB368D for ; Wed, 25 Aug 2021 20:05:41 +0200 (CEST) Received: from localhost ([::1]:59872 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxHQ-0002QX-Gb for larch@yhetil.org; Wed, 25 Aug 2021 14:05:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58958) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIxGp-0001gM-MZ for guix-patches@gnu.org; Wed, 25 Aug 2021 14:05:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36204) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIxGp-0001eI-D2 for guix-patches@gnu.org; Wed, 25 Aug 2021 14:05:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mIxGp-0002rk-7q for guix-patches@gnu.org; Wed, 25 Aug 2021 14:05:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH 27/52] gnu: heimdal: Find tools when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Aug 2021 18:05:03 +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.162991470211000 (code B ref 50201); Wed, 25 Aug 2021 18:05:03 +0000 Received: (at 50201) by debbugs.gnu.org; 25 Aug 2021 18:05:02 +0000 Received: from localhost ([127.0.0.1]:47745 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxGk-0002qv-9Q for submit@debbugs.gnu.org; Wed, 25 Aug 2021 14:05:02 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:55678) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFa-0002hr-PE for 50201@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:48 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id lu3k2500G0mfAB401u3m92; Wed, 25 Aug 2021 20:03:46 +0200 From: Maxime Devos Date: Wed, 25 Aug 2021 20:03:07 +0200 Message-Id: <20210825180332.5720-27-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 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1629914626; bh=DITiim+TRcj1fRpRiyVCuRiVKtGJZ8yZeANS4Hh3cZM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dvSP2Dmk5En7VThD5f6DAzZOwi//MuMhfGVFC5yL3qpGCJU3efLKlNhLfsWjXN/En NLlX/OL/mmk0p6PAnsHQ/dUGveov0LpB6pfyVcPnMRqWIxK8wMMd/wY+OuvfZGbfgs CCCwAS4EpDp+SThyCuhO6OQFkS1YE28ZSCSjO0STNeIYh2P7YzQ4N4YMssIC0bB3kF VhNbU8ZDDKtJBhwuxFxTO2F9nXoGVQzngbrcsQpUQDSZf+TSb5QIyCMY8TnqSv5hzx 4lPihkLUkQZjrQ/SwCDYpdLNiMUIQ6PgVKu8ATvCjy4bkmvhiop4g5cPOremZe8PmT XA6ZukcmHCRpQ== 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=1629914741; 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=DITiim+TRcj1fRpRiyVCuRiVKtGJZ8yZeANS4Hh3cZM=; b=j2ziBpYo6sVFqn6+spNhnGgesuqTPYUITCerWHgqlPPIKx+8GPIg03YWrHboOACMovZdoQ Lan8ja1cOAOFXBFMwNObfYVGP0eoBXwvn2RY1C28OSaIOzG5+XAbyyWA564FKdK7DosrpA geqbBa/DfgM6+jnUVgpDSDhrTtCu4HHlUnFvqx08gkKPyF9lTYr93z/4PftAcKxfLX6/FW FpowyMPF03MzUawZKwQUHCxrkXzxcTsmoPoJ4c1ZAHdIpXwf28vPXKwRwffQwQsw6SM4PG TwqkyH+HyxjrmmJ3TuHvLpLArYR/N2Kpps1HETl1eF3ASvKYsI61Kwq7cxTk2Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1629914741; a=rsa-sha256; cv=none; b=kc6PSRgwjlD/mCMUnOFbnm7FYbTnGkjWyLx3SY6MLN3n2OTqfhcZ9GnnsHFFPOdBwt/RAV e+uIhOQz0Hjwu132CQBbtMdQ52GSyW9s06pULYL049/5ygJf+rC3F9H9H0uoP52Hdi3PL8 g9hhiPmNIV6rjBtl+L0PAt5dK9NQ+oKXPAXrKLzi/NjGpTXxi1Wcfj9qAKG01EEbmsL8I3 OfOWZ5k0YWMagJmZzQfqNtBTyXxJ2omQpPyF+ZrX8fxxvEe7fs97fQTuZhE2LNaLtpXKqN zggjKnVBPKgRLQ5mPBgo36f6+zZk9E4G8LpYy/IorLRCj8l5d6oDbXKsrMncQA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=dvSP2Dmk; 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.67 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=dvSP2Dmk; 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: 638FB368D X-Spam-Score: 3.67 X-Migadu-Scanner: scn0.migadu.com X-TUID: JBfF1SVZhM4B * gnu/packages/kerberos.scm (heimdal)[arguments]<#:configure-flags>: Set --with-cross-tools. (heimdal)[arguments]<#:phases>{pre-configure}: Override ac_cv_PROG_COMPILE_ET. --- gnu/packages/kerberos.scm | 51 ++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 126cdf4342..85f54a4acc 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -50,6 +50,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix build-system gnu)) @@ -207,28 +208,33 @@ After installation, the system administrator should generate keys using #t)))) (build-system gnu-build-system) (arguments - `(#:configure-flags (list - ;; Avoid 7 MiB of .a files. - "--disable-static" + `(#:configure-flags + ,#~(list + ;; Avoid 7 MiB of .a files. + "--disable-static" - ;; Do not build libedit. - (string-append - "--with-readline-lib=" - (assoc-ref %build-inputs "readline") "/lib") - (string-append - "--with-readline-include=" - (assoc-ref %build-inputs "readline") "/include") + ;; Do not build libedit. + (string-append + "--with-readline-lib=" + (assoc-ref %build-inputs "readline") "/lib") + (string-append + "--with-readline-include=" + (assoc-ref %build-inputs "readline") "/include") - ;; Do not build sqlite. - (string-append - "--with-sqlite3=" - (assoc-ref %build-inputs "sqlite")) + ;; Do not build sqlite. + (string-append + "--with-sqlite3=" + (assoc-ref %build-inputs "sqlite")) - ;; The configure script is too pessimistic. - ;; Setting this also resolves a linking error. - ,@(if (%current-target-system) - '("ac_cv_func_getpwnam_r_posix=yes") - '())) + #$@(if (%current-target-system) + ;; The configure script is too pessimistic. + ;; Setting this also resolves a linking error. + #~("ac_cv_func_getpwnam_r_posix=yes" + ;; Allow 'slc' and 'asn1_compile' to be found. + (string-append "--with-cross-tools=" + #+(file-append this-package + "/libexec/heimdal"))) + #~())) #:phases (modify-phases %standard-phases (add-before 'configure 'pre-configure ;; TODO(core-updates): Unconditionally use the @@ -239,6 +245,13 @@ After installation, the system administrator should generate keys using ,(if (%current-target-system) '(#:key inputs #:allow-other-keys) '_) + ,@(if (%current-target-system) + `((substitute* "configure" + ;; Our 'compile_et' is not in --with-cross-tools, + ;; which confuses heimdal. + (("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") -- 2.33.0