From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id oAaTB8hjQmJ/0gAAgWs5BA (envelope-from ) for ; Tue, 29 Mar 2022 03:41:28 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id CGphBMhjQmI/7wAAauVa8A (envelope-from ) for ; Tue, 29 Mar 2022 03:41:28 +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 6D96C3E958 for ; Tue, 29 Mar 2022 03:41:27 +0200 (CEST) Received: from localhost ([::1]:40392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nZ0rO-0002lI-J3 for larch@yhetil.org; Mon, 28 Mar 2022 21:41:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41812) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZ0r0-0002kE-Ez for guix-patches@gnu.org; Mon, 28 Mar 2022 21:41:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37349) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nZ0r0-0008Io-4M for guix-patches@gnu.org; Mon, 28 Mar 2022 21:41:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nZ0r0-0003Xt-2Y for guix-patches@gnu.org; Mon, 28 Mar 2022 21:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54599] [PATCH] gnu: libdaemon: fix build for riscv64 Resent-From: Thiago Jung Bauermann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Mar 2022 01:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54599 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: fesoj000 Cc: 54599@debbugs.gnu.org Received: via spool by 54599-submit@debbugs.gnu.org id=B54599.164851802213574 (code B ref 54599); Tue, 29 Mar 2022 01:41:02 +0000 Received: (at 54599) by debbugs.gnu.org; 29 Mar 2022 01:40:22 +0000 Received: from localhost ([127.0.0.1]:59479 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZ0qL-0003Ws-Qo for submit@debbugs.gnu.org; Mon, 28 Mar 2022 21:40:22 -0400 Received: from mx.kolabnow.com ([212.103.80.154]:43342) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZ0qJ-0003WZ-DT for 54599@debbugs.gnu.org; Mon, 28 Mar 2022 21:40:20 -0400 Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id E3A98D76; Tue, 29 Mar 2022 03:40:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-transfer-encoding:content-type:content-type:mime-version :message-id:in-reply-to:date:date:subject:subject:from:from :references:received:received:received; s=dkim20160331; t= 1648518012; x=1650332413; bh=lwATQMwUGiLw6cbLCh6g4mq7xtPRKbRkYBO UEXZuCrw=; b=5gmUM0HWO0e0oX55CsV5mYOz8ux6rDGlq1dS8b7FEa2VNC4jRK0 rWggC58dFZuz1jfSIFPHG53r8S1S6TvCyRRVEvLQ1ewlzodFxeGLrDeG7HETtoR6 pS3n6ywkguPBCTBHbtQ3TgHm8ls7jyqzPzzMRDqIggUp7VM1VRpaH1g17gFC18gE r/X0YkNK0vauqeawDxr93gcIKQKVuQ9vUAqvKfLEfUOGZ9EtMuqt1aWno2wW2MLT JhV5X80OLXcJdLKUwlEAazSMrhzwPgptuirxhLaURHzlQZoVmHqfZAv4XvHHs/MI QEsPZujc2AORVWIGXv0B08EQMbGW51sJ3EP82Gau5oxegb4UJU4INPRjAup/7Qqy Ob4OJfCtJztAktjtkV+CKgVvTIbM6zuC+CSqlDQyDx2efnm9GBs+C2Z8nGB72+kK pPNnCfy9MxA8kp7SGEwwHBmBs95IEMv84iAo8b/JOUMCqJoRM+vQRHW4/VzVH26u XIPQW3HvwkwPsmfLNMQx4DFWAwhZF5EDjUEA/x9tEZxQhPvUBcYtcDtwTKYJ/XSi N0IZJVVDE6MjZuXDnQ4lXYAtGJKMkinbN+ut29agtYWLmLhoqA9fNxkMkDPUsTCa N6dkyrJaP4e6kT/MDU+dOfeB/TgYF9HtGRlZERRG2nJAxRUj0LXd1IAI= X-Virus-Scanned: amavisd-new at mykolab.com Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out001.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oblufi1HtPkM; Tue, 29 Mar 2022 03:40:12 +0200 (CEST) Received: from int-mx001.mykolab.com (unknown [10.9.13.1]) by mx.kolabnow.com (Postfix) with ESMTPS id B5732B9A; Tue, 29 Mar 2022 03:40:11 +0200 (CEST) Received: from ext-subm001.mykolab.com (unknown [10.9.6.1]) by int-mx001.mykolab.com (Postfix) with ESMTPS id 840CD2346; Tue, 29 Mar 2022 03:40:11 +0200 (CEST) References: Date: Mon, 28 Mar 2022 22:25:20 -0300 In-reply-to: Message-ID: <87sfr14juy.fsf@kolabnow.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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" Reply-to: Thiago Jung Bauermann X-ACL-Warn: , Thiago Jung Bauermann via Guix-patches From: Thiago Jung Bauermann via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1648518087; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=lwATQMwUGiLw6cbLCh6g4mq7xtPRKbRkYBOUEXZuCrw=; b=n0JAruS91t6KArudfoMc1jM7BVjbVb+6JEjDpu+2siwWzSBpt/dclfXgV2m04TCwN/iLzK Z9+NjJVdlFjPUXoD8H7mp0AtzH0FxJKn3UIhpz26+RH/7nbwfw1IhrKW7gVLKJm52ajs1K 4avi6CjhEmBtIMcXq2Yw+pMmoQU8c9xQ3R0tsiLSqW9QpmBci6bL0kc0z3jbcEm+n3tTyC oC1G2KC4ioHcTuioe43E407ktb77m56wCS44v38WCTKEVeG4miKIVctSaPn9L8GENsDjCt RfbVd8+ZzKDfYBMa/ljZ0MgHt9XfqMwsCBuj/OHktbjsM7adgFm7q64aPLJmpg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1648518087; a=rsa-sha256; cv=none; b=KEie9lsxxUB6vF0mOqq7EfC0wAYg2EAEOIn4o34pnX95SgrACfmeeBvYPFMboucJtgixJn jLgMsni0IDICh+dCjhd2OOuu2Wa3xTIYJycj7EXrMSxPZe7BR7T3UIoizbbLQgIsx/d/sm qgAJ7xQzggA51ZVUSWbCaLFTPN0i1eVPKT4DxiwsBg5fk1lKVYSzf8jWQzlIVEYcK1YYmI NGiEz/2n3jvcMGIdcvKDu6myP/xPdSYZzQM/f0/89eXQNAioy8POWmyGOjvLuUIFqjMFON C0tWRz5Yb3ob56l2+ZBT+a9vJtOZOph8tiPVSiA+aO30skJzXP2D47/vkVCxBw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=kolabnow.com header.s=dkim20160331 header.b=5gmUM0HW; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Spam-Score: -3.57 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=kolabnow.com header.s=dkim20160331 header.b=5gmUM0HW; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Queue-Id: 6D96C3E958 X-Spam-Score: -3.57 X-Migadu-Scanner: scn1.migadu.com X-TUID: Yheod5c0vl7k Hello, Thanks for this patch! Just a few comments: fesoj000 writes: > * gnu/packages/libdaemon.scm: (native-inputs): Add check for riscv64 to > include config > * gnu/packages/libdaemon.scm: (arguments): Add check for riscv64 to add > update-config.sub build step In the changelog, the name of the package goes in the parentheses, and the package attribute being changed in square brackets. For example: * gnu/packages/libdaemon.scm (libdaemon)[native-inputs]: Add check for riscv64 to include config. Also the sentences should have a period at the end. > --- > gnu/packages/libdaemon.scm | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/libdaemon.scm b/gnu/packages/libdaemon.scm > index 9dc851e823..e91b651e5a 100644 > --- a/gnu/packages/libdaemon.scm > +++ b/gnu/packages/libdaemon.scm > @@ -49,7 +49,8 @@ (define-public libdaemon > (file-name (string-append name "-" version ".tar.gz")))) > (build-system gnu-build-system) > (native-inputs > - (if (and=3D> (%current-target-system) target-aarch64?) > + (if (or (target-aarch64?) > + (target-riscv64?)) > `(("config" ,config)) ; for config.sub > '())) > (arguments > @@ -66,7 +67,8 @@ (define-public libdaemon > ;; Hurd's console client. > "--localstatedir=3D/var")) > '()) > - ,@(if (and=3D> (%current-target-system) target-aarch64?) > + ,@(if (or (target-aarch64?) > + (target-riscv64?)) > `(#:phases > (modify-phases %standard-phases > (add-before 'configure 'update-config.sub Before the patch, =E2=80=98native-inputs=E2=80=99 and =E2=80=98arguments=E2= =80=99 were only changed when cross-compiling on aarch64. After your patch, they are changed even for native builds. Functionally, it's not a problem but this changes the package's derivation. Since the package has many dependents, it causes a lot of other packages to be rebuilt: popigai: guix refresh --list-dependent libdaemon=20 Building the following 1496 packages would ensure 3175 dependent packages a= re rebuilt: =E2=80=A6 Because of this, the patch can't be applied on the master branch. It would have to go to core-updates. So for the master branch, you need to keep the property of only making changes to =E2=80=98native-inputs=E2=80=99 and =E2=80=98arguments=E2=80=99 = when cross-compiling. But I also suggest sending an additional patch for the core-updates branch which unconditionally updates config.sub, regardless of the architecture and regardless of whether it's a native compilation or a cross one. This way, the next time Guix is ported to a new architecture we won't need to update this package again. --=20 Thanks Thiago