From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id aOJVHr7FfmZPPQEA62LTzQ:P1 (envelope-from ) for ; Fri, 28 Jun 2024 14:16:30 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id aOJVHr7FfmZPPQEA62LTzQ (envelope-from ) for ; Fri, 28 Jun 2024 16:16:30 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=icepic.de header.s=x header.b="G xy13d5"; 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"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1719584190; 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=+3DBhXeG0GPjwjc0fA7JM9/AcIGHRf5GM/ORlUwWd4Q=; b=CWW7/Uo2Gap4xbRTZH0hmCrhGk3s+EONyjFlQR/3bNQTwgTDBneZCQ7KOfq5Vyno5W9yiv TlIvjG6iXpUlpnZXfmTFv+tQWAPTBZrd/V8cXj/vgpmPPGGmdescDMf7deunaARLeAmJzC OS3bq2b4YXDiA0LhvWqdMDQ3xe4zpPEJtf0giL/u9u7kxDGEQZ8akFlaBXWMCeAcL0oHd3 D38mzsu/pKQI07A8F1B6mYrk/zhbCzOeXL3NgoTPVoqWeLQniGyI4ruJeR9/ofJI7qtqmh I7hYY+lHgSdJZIMS4iyi7COQK+Vo6XIu92Kf5np7cbW7WphwraznwkVaPXx6dA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=icepic.de header.s=x header.b="G xy13d5"; 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"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1719584190; a=rsa-sha256; cv=none; b=Um97TMCK9jzDKMvX0sCCM6VKbHeklrO0RcggnQ+OytOev3JItiXKQetjeokL3gJ1FBiDu/ pjDWFFZI4Y72BaVLWoNbbBQLbwfzYbqRIJNjSoKwCNWLuUuh4XeA3qAUclNlYsQLh3qeJc /qBbWgAZC8QL5tEriWL4d9mffzV/0wZbTksR9XOLxkLeuTboKBvnjVSqE756M98Uf10EWS vAkAOBB+xyFIqvs9ZDs5elDmPLj6PD3h2HCBansrkG22srY6NtBQQvg8JEIRZPWTO+nKc0 zhibBG+SP0aIkwGQRIemLukjvdqHySB7qkTDqHmDCUlz6B+t5U+YvJIE4fF2cQ== 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 1967D7AD17 for ; Fri, 28 Jun 2024 16:16:30 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sNCOV-0000z8-JP; Fri, 28 Jun 2024 10:16:07 -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-0000tm-UB 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-0000wx-L6 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-0004nl-P2 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.171958410618355 (code B ref 71174); Fri, 28 Jun 2024 14:16:02 +0000 Received: (at 71174) by debbugs.gnu.org; 28 Jun 2024 14:15:06 +0000 Received: from localhost ([127.0.0.1]:46008 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sNCNV-0004ls-9Y for submit@debbugs.gnu.org; Fri, 28 Jun 2024 10:15:06 -0400 Received: from mail-108-mta235.mxroute.com ([136.175.108.235]:40759) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sNBAC-0002BK-6y for 71174@debbugs.gnu.org; Fri, 28 Jun 2024 08:57:17 -0400 Received: from filter006.mxroute.com ([136.175.111.3] filter006.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta235.mxroute.com (ZoneMTA) with ESMTPSA id 1905eebd74200017a3.001 for <71174@debbugs.gnu.org> (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Fri, 28 Jun 2024 12:57:12 +0000 X-Zone-Loop: 33ed5eb433b91b864c5a57dbe19c02856fa5bf8bc725 X-Originating-IP: [136.175.111.3] DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=icepic.de; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-ID:Date:Subject:Cc:To: From:Sender:Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=+3DBhXeG0GPjwjc0fA7JM9/AcIGHRf5GM/ORlUwWd4Q=; b=G xy13d5zxAJDXwl3Bq7+gGF8B0cA/MWVXUGlKG5A9tPQv5Ma3Xna9VrSmkArubKTjnAvPukkbxDHcX Eec5Io14KRBb6jYQL/3rzmy3Z37MPPOmJC9wzo8+Azmwha5lsX8xDQm0xuxSej2Nq6jJQiwfQIiHu Qr+geQP9mFJxMpQg0+iosIpO3MqRq3FRdEk/H0Chjj2+RXnLwWU1PQIA0pAZTRXHSMjwIOrY15hts iyQw7b7W2RURIWUAAnLYjPtIUoBYh+71Fmw90v2set2yRq82yABCSs15lKPmZEhitSWQCJLfZsFjh zhgssTDXKV1KOS4fL7zWaOxNyQQQyp/ig==; From: Christoph Buck Date: Fri, 28 Jun 2024 14:56:51 +0200 Message-ID: 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-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-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: -0.87 X-Migadu-Queue-Id: 1967D7AD17 X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -0.87 X-TUID: W+Xl127V9jtT * 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