From patchwork Fri Sep 16 13:21:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?6Lev6L6J?= X-Patchwork-Id: 42669 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 B923E27BBEA; Fri, 16 Sep 2022 14:35:56 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 423A227BBE9 for ; Fri, 16 Sep 2022 14:35:56 +0100 (BST) Received: from localhost ([::1]:56978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oZBVZ-0006H8-2U for patchwork@mira.cbaines.net; Fri, 16 Sep 2022 09:35:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33948) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oZBIA-00031E-DN for guix-patches@gnu.org; Fri, 16 Sep 2022 09:22:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43050) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oZBIA-0006UC-4z for guix-patches@gnu.org; Fri, 16 Sep 2022 09:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oZBI9-0007H8-W9 for guix-patches@gnu.org; Fri, 16 Sep 2022 09:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57860] [PATCH] gnu: libdaemon: fix the cross build. Resent-From: =?utf-8?b?6Lev6L6J?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Sep 2022 13:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57860 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57860@debbugs.gnu.org X-Debbugs-Original-To: guix-patches Received: via spool by submit@debbugs.gnu.org id=B.166333450727940 (code B ref -1); Fri, 16 Sep 2022 13:22:01 +0000 Received: (at submit) by debbugs.gnu.org; 16 Sep 2022 13:21:47 +0000 Received: from localhost ([127.0.0.1]:42128 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oZBHu-0007Ga-NP for submit@debbugs.gnu.org; Fri, 16 Sep 2022 09:21:47 -0400 Received: from lists.gnu.org ([209.51.188.17]:50212) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oZBHt-0007GT-GX for submit@debbugs.gnu.org; Fri, 16 Sep 2022 09:21:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48454) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oZBHs-0002ws-Dg for guix-patches@gnu.org; Fri, 16 Sep 2022 09:21:44 -0400 Received: from mail-yw1-x1142.google.com ([2607:f8b0:4864:20::1142]:42652) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oZBHq-0006Oa-Qw for guix-patches@gnu.org; Fri, 16 Sep 2022 09:21:44 -0400 Received: by mail-yw1-x1142.google.com with SMTP id 00721157ae682-3378303138bso259474537b3.9 for ; Fri, 16 Sep 2022 06:21:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date; bh=HB6skbY6vssAWu+j/7DPPJREqdifb4yJgtnMt4Z1Hak=; b=jRZDVQteeO+n/srgw9VWCnWBGYWJtXP2qjuEc3xp8JZqcx71aml4mHbF3LicFIKq3o 4NX2wBkH4Adv0HeYehp94WYLUvE/dr9VV478r+LPl2tYny7ag5YtxEeXRwI+64toM7xf iQFb+cdv3jIpBvGUJ0kp6ORH7V3It+67V03W8o5PKMHRsDmzCTClQtOqBaQbjv9IQ80a TPfi8JBgOqyhjJZpCPnCG/kED41Yr95a724ENcd8/M/o27PD9S28RivlO3FJZW4Ypv4i NBqx6g4wiABzCd92wCL7NEA6bzO4vU4z92nVNhmN2Pk6zyKdCoftvGEy1Xnkh2C/g5Qe CVzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date; bh=HB6skbY6vssAWu+j/7DPPJREqdifb4yJgtnMt4Z1Hak=; b=8PO5iPYn8i7fCyT2i4tMbox0qywiPsFzOzAUeE7ulfAYU04Nn8l06X8ZIfSVZv4fV9 rzPUOVFENc2NC9TxdvciJzcYDAPacMzOR0Tm9NNl5ZbBGXvBfFMJDun7HKNgn6Hdgbsl h1FHBr67qct12JDcx/qC2CVGPuOq1+QQ3c1kHB0S1R8kHphiNn0s9QTJ5JOfWC+uKfDo 8VSi4IhapBR7lXu2tBBUUQEDxq2BYhPa3n3tCuXROsknF+pFGzZrTF7tAbUInJCbzuw4 m1uqpgQMvmb6/LyDoE4JDkYmZTHqefOUBAk3DuQm6NaqstmmzA1eoA/fIk2aHgNkzRYF Acgw== X-Gm-Message-State: ACrzQf21yq/Obpe8l2BkGHHwQGgUygNelK6hmpU2IlWNOPE2DfpsloaO EqPtn3urerb2nwBdZrjzw58ivWTl7EB0snfg2yfGNdQE7GMgafob X-Google-Smtp-Source: AMsMyM7zBRaNluOnq46fVvFu3Ygv242W1f+KaapAU1JYpSp36D7venzsO1Q34Ky3gBYAo3bvVdTAUqIbn9c31cSeCbM= X-Received: by 2002:a81:83d0:0:b0:345:2499:cd76 with SMTP id t199-20020a8183d0000000b003452499cd76mr4364978ywf.500.1663334501517; Fri, 16 Sep 2022 06:21:41 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a0d:d0c6:0:0:0:0:0 with HTTP; Fri, 16 Sep 2022 06:21:40 -0700 (PDT) From: =?utf-8?b?6Lev6L6J?= Date: Fri, 16 Sep 2022 13:21:40 +0000 Message-ID: Received-SPF: pass client-ip=2607:f8b0:4864:20::1142; envelope-from=luhux76@gmail.com; helo=mail-yw1-x1142.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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 From bec033b9045a375530f23020eaa96819376d9417 Mon Sep 17 00:00:00 2001 From: Lu Hui Date: Fri, 16 Sep 2022 20:46:06 +0800 Subject: [PATCH] gnu: libdaemon: fix the cross build. * gnu/packages/libdaemon.scm (libdaemon): fix cross build --- gnu/packages/libdaemon.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libdaemon.scm b/gnu/packages/libdaemon.scm index 9dc851e823..12e4e2dc9c 100644 --- a/gnu/packages/libdaemon.scm +++ b/gnu/packages/libdaemon.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2020 Ludovic Courtès ;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2022 LuHui ;;; ;;; This file is part of GNU Guix. ;;; @@ -49,7 +50,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 (and=> (%current-target-system) target-aarch64?) + (and=> (%current-target-system) target-riscv64?)) `(("config" ,config)) ; for config.sub '())) (arguments @@ -66,7 +68,8 @@ (define-public libdaemon ;; Hurd's console client. "--localstatedir=/var")) '()) - ,@(if (and=> (%current-target-system) target-aarch64?) + ,@(if (or (and=> (%current-target-system) target-aarch64?) + (and=> (%current-target-system) target-riscv64?)) `(#:phases (modify-phases %standard-phases (add-before 'configure 'update-config.sub -- 2.37.3