* [bug#57860] [PATCH] gnu: libdaemon: fix the cross build.
@ 2022-09-16 13:21 路辉
2022-10-06 14:19 ` bug#57860: " Christopher Baines
0 siblings, 1 reply; 2+ messages in thread
From: 路辉 @ 2022-09-16 13:21 UTC (permalink / raw)
To: 57860
[-- Attachment #1: Type: text/plain, Size: 1 bytes --]
[-- Attachment #2: 0001-gnu-libdaemon-fix-the-cross-build.patch --]
[-- Type: text/x-patch, Size: 1789 bytes --]
From bec033b9045a375530f23020eaa96819376d9417 Mon Sep 17 00:00:00 2001
From: Lu Hui <luhux76@gmail.com>
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 <ludo@gnu.org>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
+;;; Copyright © 2022 LuHui <luhux76@gmail.com>
;;;
;;; 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#57860: [PATCH] gnu: libdaemon: fix the cross build.
2022-09-16 13:21 [bug#57860] [PATCH] gnu: libdaemon: fix the cross build 路辉
@ 2022-10-06 14:19 ` Christopher Baines
0 siblings, 0 replies; 2+ messages in thread
From: Christopher Baines @ 2022-10-06 14:19 UTC (permalink / raw)
To: 路辉; +Cc: 57860-done
[-- Attachment #1: Type: text/plain, Size: 284 bytes --]
路辉 <luhux76@gmail.com> writes:
> [2. text/x-patch; 0001-gnu-libdaemon-fix-the-cross-build.patch]...
Thanks for the patch. I tweaked the commit message slightly to try and
make it more specific, and pushed to master as
5b42b64ea89564c58325d16d3d0f4a0a03ebae0f.
Chris
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-10-06 14:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-16 13:21 [bug#57860] [PATCH] gnu: libdaemon: fix the cross build 路辉
2022-10-06 14:19 ` bug#57860: " Christopher Baines
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).