From patchwork Sat Dec 16 22:59:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Leo_Nikkil=C3=A4?= X-Patchwork-Id: 57657 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 A518427BBE9; Sat, 16 Dec 2023 23:01:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3B6BC27BBE2 for ; Sat, 16 Dec 2023 23:01:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rEdea-0003Wy-HD; Sat, 16 Dec 2023 18:01:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rEdeY-0003Wn-Pq for guix-patches@gnu.org; Sat, 16 Dec 2023 18:01:02 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rEdeX-0001ZU-Oc for guix-patches@gnu.org; Sat, 16 Dec 2023 18:01:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rEdeY-0004lp-J9 for guix-patches@gnu.org; Sat, 16 Dec 2023 18:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67861] [PATCH] gnu: cryptsetup: Fix cross-compilation. Resent-From: Leo =?utf-8?q?Nikkil=C3=A4?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Dec 2023 23:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67861 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67861@debbugs.gnu.org Cc: Leo =?utf-8?q?Nikkil=C3=A4?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170276761311406 (code B ref -1); Sat, 16 Dec 2023 23:01:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Dec 2023 23:00:13 +0000 Received: from localhost ([127.0.0.1]:56314 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rEddk-0002wX-U6 for submit@debbugs.gnu.org; Sat, 16 Dec 2023 18:00:13 -0500 Received: from lists.gnu.org ([2001:470:142::17]:54436) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rEddj-0002aC-A5 for submit@debbugs.gnu.org; Sat, 16 Dec 2023 18:00:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rEddd-0003Og-51 for guix-patches@gnu.org; Sat, 16 Dec 2023 18:00:05 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rEddb-0001HF-IM for guix-patches@gnu.org; Sat, 16 Dec 2023 18:00:04 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id ED7125C00EF; Sat, 16 Dec 2023 18:00:02 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sat, 16 Dec 2023 18:00:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lnikki.la; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:message-id:mime-version:reply-to :subject:subject:to:to; s=fm3; t=1702767602; x=1702854002; bh=80 SdwNszDQyUDPwoJ0Mn9H6CaDbBwBBD5Ka3Kn3N0yY=; b=j11+8/jfo3lnhB0Ni/ PzzlM/rvRjUTWiY8QDM9yxR2hQp51KZB6NjuMkDLphatk/jD5iQHsgsI0ClPqBIo 79py05aNU5rI8wBxwEjoXpwJGTlug2mb0hjzP6n5CxHMLGNQodi0nC72/dHnOAk3 AmPTys+FdPbo4HXs/c6thmaAX80MtloXcKR7NNAgqW7ErlglcEpjD/dJQtR6aB4c Whzrv+j/WQCunKcu+hBtHshMah5wCnBuDDi9mSMsLM5Sy1UvrhTFop79aFzCFaoQ i8hDmMaltgS/lB1Z/ehZdKmgtWgEGvD4Fa3EF4MCGFLGJciD1pmUdjsTQEQUx3Bf JB0A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1702767602; x=1702854002; bh=80SdwNszDQyUD PwoJ0Mn9H6CaDbBwBBD5Ka3Kn3N0yY=; b=jP1KT4A3MtmAmit8SVn3FvNxP6Rmc lFMk6uqZeiYZBaA0p7Y91ZGGjzWSlMkX2exfdaxTp7DFSTJjecbfQEYLjmLRHr9d DQj0fmkckvqBqLZnAS26N+UZO5rn85Np07CaOtkbK0aKGD+dGsiZY+xGDgoBMnQ3 yn0Ooi0jvHQx1mZBH1lB/YSb3HzTvnGro9PTvmGo9Y7V42dj7DplpNu3ukekeYTp o/h4voRvZ1YijvDjiLwFGtHTUjfH4Oai7OwoAdTdZD4O19eAFeIWBCI/PZKYj30b 3DLCMUhKv8q/+8tuMlF4Q4Nw0bzMl65r8Hf/9mlTGHM9/yC0K5d3lzEOA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvddthedgtdeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffogggtgfesthekre dtredtjeenucfhrhhomhepnfgvohcupfhikhhkihhlmocuoehhvghllhhosehlnhhikhhk ihdrlhgrqeenucggtffrrghtthgvrhhnpeefhefghfelfeefkeetheelieethfehvdelff eiueehieeuieevudfhueeuffefudenucffohhmrghinhepghhnuhdrohhrghenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehhvghllhhosehlnh hikhhkihdrlhgr X-ME-Proxy: Feedback-ID: i41f146a7:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 16 Dec 2023 18:00:01 -0500 (EST) Date: Sun, 17 Dec 2023 00:59:29 +0200 Message-ID: <20231216225957.5259-1-hello@lnikki.la> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=66.111.4.25; envelope-from=hello@lnikki.la; helo=out1-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Leo =?utf-8?q?Nikkil=C3=A4?= X-ACL-Warn: , =?utf-8?q?Leo_Nikkil=C3=A4_via_Guix-patches?= X-Patchwork-Original-From: =?utf-8?q?Leo_Nikkil=C3=A4_via_Guix-patches?= via From: =?utf-8?q?Leo_Nikkil=C3=A4?= Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cryptsetup.scm (cryptsetup): Set explicit `--with-libgcrypt-prefix' for cross-compilation. --- gnu/packages/cryptsetup.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm index d8a6437259..3bdc68ae5a 100644 --- a/gnu/packages/cryptsetup.scm +++ b/gnu/packages/cryptsetup.scm @@ -53,7 +53,11 @@ (define-public cryptsetup ;; The default is OpenSSL which provides better PBKDF performance. "--with-crypto_backend=gcrypt" ;; GRUB 2.06 supports LUKS2, but does it reliably support all set-ups…? - "--with-default-luks-format=LUKS1"))) + "--with-default-luks-format=LUKS1" + ;; libgcrypt is not found otherwise when cross-compiling. + ;; + (string-append "--with-libgcrypt-prefix=" + (assoc-ref %build-inputs "libgcrypt"))))) (native-inputs (list pkg-config)) (inputs