From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id aLGjAawTf2ZqdgEA62LTzQ:P1 (envelope-from ) for ; Fri, 28 Jun 2024 19:49:00 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id aLGjAawTf2ZqdgEA62LTzQ (envelope-from ) for ; Fri, 28 Jun 2024 21:49:00 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1719604139; 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; bh=+3DBhXeG0GPjwjc0fA7JM9/AcIGHRf5GM/ORlUwWd4Q=; b=XRcs1VBQ8hZ5bsgPyFUSUmr41A0EBQdMPI6Fro9mbVXzbRb0CRSfNhSe/YTeUDtcIPabOF D11IJMFob/2QgxqRFy1vSYBIENSjhiHSaoBewOn90txaDC5qHX2+5BlAX3/gCFiBmOt/k3 4Ej0mxO0ZqUrqmCBhow8kFNYlDm1ZrJzf1fPiP4Q+zyljTqcfLifNc+poskmDmW4H2Tr2b V0vE8sP2NiKUJ1coTvEV5pkvXnYzPxLH8GiQiyyktC92v/0e0ayQ4BQ2MLm7ilG3CMuoRN V8U+bWTCbyZ5gE8axs6OuCH6EuGmhgJeUNj2XDI2aoX3/FCWqw1cQazS33pWBw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1719604139; a=rsa-sha256; cv=none; b=njLSxIvWprZ2puUpsCpDJ902cTK6L4aZhMTnkmGAZOZG7pZw2ILMG0vQUZcGxVKbvgYMYD EcnKgcctP01gR/EHnkQ2G0Hy7MkskDCaWJU84+7peJ2X/mmiIkwnjmsa9U19zzVTRN6EV8 4rhXuwKi36lh41F/OMRBkkzEbfJGYfKjbV6JFpjMapYwE4SnI78VkbDIGy6qCeRjNAxnvY EgNBBFRD6+ApQSouRxxbtRNgBPhCWSU4g0z1KS3XZXH5UZhMoZcwzlMwGyBdx0/4Ms/wLX 8WjSpKlcWoJPPZ9dvLCyrBBu1GCzil7VWTeaQ2tP3pks3YiA3tiAtYGLXDqdqg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" 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 A9E2265BCA for ; Fri, 28 Jun 2024 21:48:59 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sNHaJ-0003Jk-NF; Fri, 28 Jun 2024 15:48:39 -0400 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 1sNCOR-0000tC-Ll for bug-guix@gnu.org; Fri, 28 Jun 2024 10:16:05 -0400 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 1sNCOR-0000wh-0n for bug-guix@gnu.org; Fri, 28 Jun 2024 10:16:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sNCOQ-0004ne-B9 for bug-guix@gnu.org; Fri, 28 Jun 2024 10:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#71174: [PATCH] gnu: libb2: Fix cross-compilation for non x86_64 systems References: <874jantepp.fsf@icepic.de> In-Reply-To: <874jantepp.fsf@icepic.de> Resent-From: Christoph Buck Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 28 Jun 2024 14:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71174 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 71174@debbugs.gnu.org Cc: Christoph Buck Received: via spool by 71174-submit@debbugs.gnu.org id=B71174.171958410418347 (code B ref 71174); Fri, 28 Jun 2024 14:16:02 +0000 Received: (at 71174) by debbugs.gnu.org; 28 Jun 2024 14:15:04 +0000 Received: from localhost ([127.0.0.1]:46006 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sNCNT-0004lm-Et for submit@debbugs.gnu.org; Fri, 28 Jun 2024 10:15:04 -0400 Received: from mail-108-mta144.mxroute.com ([136.175.108.144]:41731) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sNAnT-0001dY-Rk for 71174@debbugs.gnu.org; Fri, 28 Jun 2024 08:33:48 -0400 Received: from filter006.mxroute.com ([136.175.111.3] filter006.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta144.mxroute.com (ZoneMTA) with ESMTPSA id 1905ed6551b00017a3.001 for <71174@debbugs.gnu.org> (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Fri, 28 Jun 2024 12:33:43 +0000 X-Zone-Loop: af6e99285c219a6ebfc1dc1b88ef38a3911672d63e39 X-Originating-IP: [136.175.111.3] From: Christoph Buck Date: Fri, 28 Jun 2024 14:33:11 +0200 Message-ID: <49709079427ebd67560089df240d7aeb1bab9b1c.1719577991.git.dev@icepic.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Authenticated-Id: dev@icepic.de X-Mailman-Approved-At: Fri, 28 Jun 2024 10:15:01 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Fri, 28 Jun 2024 15:48:36 -0400 X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -1.88 X-Spam-Score: -1.88 X-Migadu-Queue-Id: A9E2265BCA X-Migadu-Scanner: mx11.migadu.com X-TUID: GG5UQECA8Joa * gnu/packages/crypto.scm (libb2): Disable fat-binary compile time option for non x86_64 target systems. Change-Id: Ibdf009960fecae4ffc033a36b3abf28c2f8935aa --- gnu/packages/crypto.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 9c62689d18..1d376fb43c 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -809,12 +809,14 @@ (define-public libb2 (arguments `(#:configure-flags (list - ,@(if (any (cute string-prefix? <> (or (%current-system) - (%current-target-system))) - '("x86_64" "i686")) - ;; fat only checks for Intel optimisations - '("--enable-fat") - '()) + ,@(let ((check-x86 (lambda (triplet) (any (cute string-prefix? <> triplet) '("x86_64" "i868"))))) + (if (%current-target-system) + (if (check-x86 (%current-target-system)) + '("--enable-fat") + '()) + (if (check-x86 (%current-system)) + '("--enable-fat") + '()))) "--disable-native"))) ;don't optimise at build time (home-page "https://blake2.net/") (synopsis "Library implementing the BLAKE2 family of hash functions") base-commit: 6a7d5cda17fd9d4bd99c58f7a5dbdd2d021354f9 -- 2.45.1