From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id ULyqEZc4HmUpHQEA9RJhRA:P1 (envelope-from ) for ; Thu, 05 Oct 2023 06:16:23 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id ULyqEZc4HmUpHQEA9RJhRA (envelope-from ) for ; Thu, 05 Oct 2023 06:16:23 +0200 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 D380B43F79 for ; Thu, 5 Oct 2023 06:16:22 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=jzWW7BtP; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1696479383; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: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=dgOGfubZdcWYWVdvx//zI746yAw35wc9oRREmAqBcZM=; b=Vq8MSkrCHSCHCSxcpJwO3+HDnM5MnU/uR2nZqQSeOTjk6RUHRB3JDnyXn2qksCFU1IQgoH WdPekw/muAJITE4vp+zevrZpgIUjGP1Qrjar9QSjxsmQEun6cl1OJTKeegpyJriiabAHIL b3VLmpylzAWu28WFIyCIWgQevthA5sF9dlSSQcqoEAGYFgyCLpPh6ZE3Sr51Hmg07x4V17 wTXMiMtoFz7gF5rs1g9Hkm9M5YZsv5CLu/AMTMkNulHw79E46vzNBzTdvv3ktcXjOYtB+a ChnsyetVyKMAQtz6ui0XQuB7Zg9DnkgJEAN4ATh45C2WV/aBfQY7QgBrn+28cA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1696479383; a=rsa-sha256; cv=none; b=h7gG9X8fXGj8h720ZSFjYzVoiZCtic8eKd4NFXzYDXwPvULZBfGz7nkjDVfI5oWz9kmtA3 3WfOSRxOkuLslJLqlGnqIcUNRS7vA85mJP5x2WJVpN0+x3U9O7t+CqBkxAwOdK3slLucNX ixdK7WzRK+f2v9NmzOt9iQyZn2IIy23Z5WATUIhNKwd3WztazmXR12iLcx/8JEw59sfqqm y6bSaVXnee3FXpPDhKtO/mL3poDaafanPsUpES2+V4Pd2TwzUrZ07qhFBLvHypdAYWAtwh QwNZDBpQWa4O4qOsJ2x+GHuZ2Y3y3hqHZ5RnL16M2I4nQlTLWgd3rOVe343MbA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=jzWW7BtP; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoFmH-0003eY-4q; Thu, 05 Oct 2023 00:15:57 -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 1qoFm6-0003eC-4u for guix-patches@gnu.org; Thu, 05 Oct 2023 00:15:47 -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 1qoFm4-0002OV-Rc for guix-patches@gnu.org; Thu, 05 Oct 2023 00:15:45 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qoFmM-0007zv-43 for guix-patches@gnu.org; Thu, 05 Oct 2023 00:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66263] [PATCH 00/23] guix: Add avr as a platform. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Oct 2023 04:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66263 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Jean-Pierre De Jesus DIAZ Cc: 66263@debbugs.gnu.org, vagrant@debian.org, efraim@flashner.co.il Received: via spool by 66263-submit@debbugs.gnu.org id=B66263.169647935730732 (code B ref 66263); Thu, 05 Oct 2023 04:16:02 +0000 Received: (at 66263) by debbugs.gnu.org; 5 Oct 2023 04:15:57 +0000 Received: from localhost ([127.0.0.1]:45676 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoFmG-0007za-Un for submit@debbugs.gnu.org; Thu, 05 Oct 2023 00:15:57 -0400 Received: from mail-qt1-x830.google.com ([2607:f8b0:4864:20::830]:59563) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoFmE-0007zL-2E for 66263@debbugs.gnu.org; Thu, 05 Oct 2023 00:15:55 -0400 Received: by mail-qt1-x830.google.com with SMTP id d75a77b69052e-41954a3e282so3086831cf.2 for <66263@debbugs.gnu.org>; Wed, 04 Oct 2023 21:15:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696479330; x=1697084130; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=dgOGfubZdcWYWVdvx//zI746yAw35wc9oRREmAqBcZM=; b=jzWW7BtP8/RlVX9pTy6sSi3YJty1xCG7PGWgeuKe1aXK7J6pkKqeLvWM6g0sPQ/JE8 EWbecyCpXli5ywXwHWN9o3hHmTx9ccb35ekHvfZAxlUpMbPEIPAh7iZQe4SU01CPzxtW fUOq0/zD36CcetpJFI7IGIVi4H6t0vbQyrhSQWS518y4tZeuWpx5q8Lwj9+/OMOABdRw d/3fQmPliJt408vhlei6eptzGpnO2UQd8akssptwfTPpK6pqPqmYLC6+Ty2SjpDVLQcF wcGUGuZQpsRCUHbDmBA0QCPAeKEzJDPutNARu0UETi3xfQlatduA9baAxGT0FmmB2QVb muig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696479330; x=1697084130; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=dgOGfubZdcWYWVdvx//zI746yAw35wc9oRREmAqBcZM=; b=l43iy92fg6o7qCvKUzBMWD+50acVZ9EOghbGV7kVQdVj6FrF2RQvUA5ogWflPq9CIT HfvSmd4sq6SG4XhrF4LvA50N0l1DkUCzHIgJe4NwErsAzGsRkeLqS13AjHskpM8U5UVN zNhEihcsovV6l95pjUKPa0PFlS4GVfHYF8s7Rc0TB6Z+GF8jLaFwPMUA5zZODB5vVosR AJ0dVNr59nQbmNbrMnqHK+QSJJxwKvOZbHF6iLBTUq9Brx4Wr9y9B2fY3brsl2Ih9oiq qh/bo1xByh4+Gu+iSJVv9u949AX9FxLJE5dV9ps4fKvGxSC+HBJsHYJdGYJeaEIwGdEC N4eA== X-Gm-Message-State: AOJu0YyAnZDRQR5EGhYZX+U2ttCqlcYOdRK7CWT4TAv5/RZ//M8FVU6p mW0ZLbKIX9oCqcX9z+w9gClfkNrzaZrqBA== X-Google-Smtp-Source: AGHT+IHXkUq566XXz/oK2vfaDP56IFkGEtprpNrj1BzwEUahuGeTQmmHpkjfg2Nw3EcDjHTAGZtNZA== X-Received: by 2002:ac8:5fc7:0:b0:419:544d:5886 with SMTP id k7-20020ac85fc7000000b00419544d5886mr4728291qta.19.1696479329865; Wed, 04 Oct 2023 21:15:29 -0700 (PDT) Received: from hurd (dsl-141-24.b2b2c.ca. [66.158.141.24]) by smtp.gmail.com with ESMTPSA id h22-20020ac87156000000b0041976a54e1bsm232445qtp.44.2023.10.04.21.15.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 21:15:29 -0700 (PDT) From: Maxim Cournoyer References: <20230929091627.7820-1-jean@foundationdevices.com> <20230929091627.7820-5-jean@foundationdevices.com> Date: Thu, 05 Oct 2023 00:15:28 -0400 In-Reply-To: <20230929091627.7820-5-jean@foundationdevices.com> (Jean-Pierre De Jesus DIAZ's message of "Fri, 29 Sep 2023 11:16:09 +0200") Message-ID: <87jzs11z8f.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: 2.76 X-Migadu-Spam-Score: 2.76 X-Migadu-Scanner: mx1.migadu.com X-Migadu-Queue-Id: D380B43F79 X-TUID: Ia7qmFARMH/D Hi, Jean-Pierre De Jesus DIAZ writes: > * gnu/packages/cross-base.scm (cross-gcc-arguments) > [target-avr?]: Remove --disable-mutlilib and add --enable-multilib. > --- > gnu/packages/avr.scm | 4 +--- > gnu/packages/cross-base.scm | 17 +++++++++++++---- > 2 files changed, 14 insertions(+), 7 deletions(-) > > diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm > index b9bee5e624..e976203b89 100644 > --- a/gnu/packages/avr.scm > +++ b/gnu/packages/avr.scm > @@ -75,9 +75,7 @@ (define avr-gcc > ;; several scripts inside this script, each with a #!/bin/sh > ;; that needs patching. > (substitute* "gcc/genmultilib" > - (("#!/bin/sh") (string-append "#!" (which "sh")))))))) > - ((#:configure-flags flags) > - #~(delete "--disable-multilib" #$flags)))) > + (("#!/bin/sh") (string-append "#!" (which "sh")))))))))) > (native-search-paths > (list (search-path-specification > (variable "CROSS_C_INCLUDE_PATH") > diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm > index f55765f1b0..ec7ca2186d 100644 > --- a/gnu/packages/cross-base.scm > +++ b/gnu/packages/cross-base.scm > @@ -197,12 +197,21 @@ (define (cross-gcc-arguments target xgcc libc) > #~((string-append "--with-toolexeclibdir=" > (assoc-ref %outputs "lib") > "/" #$target "/lib")) > + #~()) > + > + #$@(if (target-avr? target) > + #~("--enable-multilib") > + #~()) > + > #~())) > > - #$(if libc > - flags > - #~(remove (cut string-match "--enable-languages.*" <>) > - #$flags)))) > + (remove > + (lambda (flag) > + (or (and (string-match "--enable-languages.*" flag) > + #$libc) Not your code, but it'd be cleaner to use (string-prefix? "--enable-languages" flag) here. > + (and (string-match "--disable-multilib" flag) > + #$(target-avr? target)))) I'd also move the #$libc above and #$(target-avr? ...) expressions as the first tests for 'and', as there is no reason to match strings when these are #f. -- Thanks, Maxim