From patchwork Sun Mar 27 19:24:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fesoj000 X-Patchwork-Id: 38146 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 C234327BBEA; Sun, 27 Mar 2022 20:25:24 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS 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 7D92427BBE9 for ; Sun, 27 Mar 2022 20:25:24 +0100 (BST) Received: from localhost ([::1]:39546 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYYVv-0004Ct-Kj for patchwork@mira.cbaines.net; Sun, 27 Mar 2022 15:25:23 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYYVa-0004Bb-T6 for guix-patches@gnu.org; Sun, 27 Mar 2022 15:25:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34441) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nYYVa-0002hU-Ie for guix-patches@gnu.org; Sun, 27 Mar 2022 15:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nYYVa-00018M-Ew for guix-patches@gnu.org; Sun, 27 Mar 2022 15:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54599] [PATCH] gnu: libdaemon: fix build for riscv64 Resent-From: fesoj000 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Mar 2022 19:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 54599 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54599@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16484090674305 (code B ref -1); Sun, 27 Mar 2022 19:25:02 +0000 Received: (at submit) by debbugs.gnu.org; 27 Mar 2022 19:24:27 +0000 Received: from localhost ([127.0.0.1]:56571 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYYV1-00017M-A7 for submit@debbugs.gnu.org; Sun, 27 Mar 2022 15:24:27 -0400 Received: from lists.gnu.org ([209.51.188.17]:37038) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYYUy-00017D-Fy for submit@debbugs.gnu.org; Sun, 27 Mar 2022 15:24:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYYUy-0003ul-8U for guix-patches@gnu.org; Sun, 27 Mar 2022 15:24:24 -0400 Received: from [2a00:1450:4864:20::62e] (port=35564 helo=mail-ej1-x62e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nYYUw-0002fa-R3 for guix-patches@gnu.org; Sun, 27 Mar 2022 15:24:23 -0400 Received: by mail-ej1-x62e.google.com with SMTP id yy13so24633772ejb.2 for ; Sun, 27 Mar 2022 12:24:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:from:subject :content-language:to:content-transfer-encoding; bh=ZM8v+x2vjlbGTA6EL37ta7QtVu07r7sBH4LUdudcLz8=; b=BtZOHpZqP+3u8Q9W0MA5yR5TP07hgFeFv3tn3AfjSptcy/6OO2RJu6urXrMfs1lSHb VR5hwOjWxAmDDqEdbclIU4MWtYfL5699Fe/ci6vfdGZwktx2oNbMkTT0VzzCZNkVE4U0 3Q5ygJcwkmOSufIIFRDt4rbMSUX4EpnJHbM+tW2JS96qLfq0CHMkp9FTaAa8H9T1k9Nx fxHxvxx2X7FSPBdivRtyIhwNogXMw7AIpmQziPb5uzZzDTEsBMZHy58e4AyWdUPy+0aM FEITXgtbaUuhH5wZv2jzAhcgBR6TJSrOnqPSjw+KgWC3lwKZcE4nyAOAuUUpl8l8X+kM QrCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:from :subject:content-language:to:content-transfer-encoding; bh=ZM8v+x2vjlbGTA6EL37ta7QtVu07r7sBH4LUdudcLz8=; b=B4/xbDQKnLcMEhinKXzQZtbFW+Sy3FOAWrhoK2qzQ4liXUCXbhw0IFWab1MhXU7Chb 5RCXpVnyk/N5zEg7WyQXBKtAkc33uASVQi3ezp00BdS+o/ut6A9j8CpDpj9UdiSgaQOl 3DjFs7sBWEjFI+XblLevALdSh0EOEWGoeCa6KVtVSU8f7G8T7eH4htkWJi4y7xeDtmum Oq9b38dgxtIkChTAjgetGu9ZIQHJi60TNdeaha39kQbrmqS83nSDLzlDdeA5Ev9i+6Oq 39MQcfGCrM5jwU6OuNEnmBX7vQNV+3txIYW7QCvkKzf9SFA8q6KTnVtToR8srx8gVgVb ZCcQ== X-Gm-Message-State: AOAM531kq8DeiXDvk6rtzcFMS8oKSYKYQsz/i+BG30k1ev9cWEQ5sPAG uPH2ANbOsK+Lv2d1l704/vmem1lTWjg= X-Google-Smtp-Source: ABdhPJwz85uwsoERcI2aUMDOdNC3BD3g4Ah7ZQRkqeHUKo1eZB3aLIZJwezVEHAk+lCrWWZ/p3Zkog== X-Received: by 2002:a17:907:9617:b0:6df:d17b:f869 with SMTP id gb23-20020a170907961700b006dfd17bf869mr23589906ejc.569.1648409060689; Sun, 27 Mar 2022 12:24:20 -0700 (PDT) Received: from ?IPV6:2003:ee:af13:4e00:138c:330:2a14:b8fb? (p200300eeaf134e00138c03302a14b8fb.dip0.t-ipconnect.de. [2003:ee:af13:4e00:138c:330:2a14:b8fb]) by smtp.gmail.com with ESMTPSA id y26-20020a1709063a9a00b006e0c272e263sm2498407ejd.71.2022.03.27.12.24.19 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 27 Mar 2022 12:24:20 -0700 (PDT) Message-ID: Date: Sun, 27 Mar 2022 21:24:20 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 From: fesoj000 Content-Language: en-US X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62e (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=fesoj000@gmail.com; helo=mail-ej1-x62e.google.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action 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/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 --- 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=> (%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=/var")) '()) - ,@(if (and=> (%current-target-system) target-aarch64?) + ,@(if (or (target-aarch64?) + (target-riscv64?)) `(#:phases (modify-phases %standard-phases (add-before 'configure 'update-config.sub