From patchwork Sun Mar 27 12:29:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?S=C3=A9bastien_Lerique?= X-Patchwork-Id: 38140 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 73E9F27BBEA; Sun, 27 Mar 2022 13:31:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 47F1527BBE9 for ; Sun, 27 Mar 2022 13:31:15 +0100 (BST) Received: from localhost ([::1]:56260 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYS38-0004di-Bv for patchwork@mira.cbaines.net; Sun, 27 Mar 2022 08:31:14 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39172) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYS2x-0004ad-EA for guix-patches@gnu.org; Sun, 27 Mar 2022 08:31:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33311) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nYS2x-0004Lj-2o for guix-patches@gnu.org; Sun, 27 Mar 2022 08:31:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nYS2v-0007VY-Vf for guix-patches@gnu.org; Sun, 27 Mar 2022 08:31:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54595] [PATCH 2/2] gnu: libfido2: Fix cross-compilation. Resent-From: =?utf-8?q?S=C3=A9bastien?= Lerique Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Mar 2022 12:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54595 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54595@debbugs.gnu.org Cc: =?utf-8?q?S=C3=A9bastien?= Lerique Received: via spool by 54595-submit@debbugs.gnu.org id=B54595.164838423328815 (code B ref 54595); Sun, 27 Mar 2022 12:31:01 +0000 Received: (at 54595) by debbugs.gnu.org; 27 Mar 2022 12:30:33 +0000 Received: from localhost ([127.0.0.1]:55440 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYS2S-0007Ug-Rq for submit@debbugs.gnu.org; Sun, 27 Mar 2022 08:30:33 -0400 Received: from elegua.eauchat.org ([91.224.149.118]:59948 helo=eauchat.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYS2Q-0007US-Hg for 54595@debbugs.gnu.org; Sun, 27 Mar 2022 08:30:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eauchat.org; s=mail; t=1648384220; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=S7n8axeRw6n0UusNGxWsdGIPzQeirTrULzvuDas4mlM=; b=TkSyWX2aD4YvLbz/mxnT3k8/udgbPzavEOdzE+JXhjuwq05DD0+OJY+CODmUFtYPBp0+vG 8VGWG/y6wZfxUV8MqyaZuV7nYdpVWhIzdFsZmRp+tTSIJJ/H1aMHlByCf8WdvbzL0sx+3O TA9JD66WaunLPkncVbBZegzWIW/3jSs= From: =?utf-8?q?S=C3=A9bastien?= Lerique Date: Sun, 27 Mar 2022 21:29:56 +0900 Message-Id: <20220327122956.524901-2-sl@eauchat.org> In-Reply-To: <20220327122956.524901-1-sl@eauchat.org> References: <20220327122956.524901-1-sl@eauchat.org> MIME-Version: 1.0 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/security-token.scm (libfido2)[arguments]: Set PKG_CONFIG_EXECUTABLE variable when cross-compiling. --- gnu/packages/security-token.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 6853d5bc9e..903da686f9 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -906,7 +906,16 @@ (define-public libfido2 (inputs (list zlib eudev libcbor openssl)) (build-system cmake-build-system) (arguments - '(#:phases + `(#:configure-flags (list ,@(if (%current-target-system) + `((string-append + "-DPKG_CONFIG_EXECUTABLE=" + (search-input-file %build-inputs + (string-append + "/bin/" + ,(%current-target-system) + "-pkg-config")))) + '())) + #:phases (modify-phases %standard-phases ;; regress tests enabled only for debug builds (delete 'check))))