[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
34/52: gnu: libdaemon: Support cross-compilation to aarch64-linux-gnu.
From: |
guix-commits |
Subject: |
34/52: gnu: libdaemon: Support cross-compilation to aarch64-linux-gnu. |
Date: |
Mon, 20 Sep 2021 07:19:36 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates-frozen
in repository guix.
commit 35e1a572f6424c4d9bd2679590be14d664dd2121
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Wed Aug 25 12:34:35 2021 +0200
gnu: libdaemon: Support cross-compilation to aarch64-linux-gnu.
* gnu/packages/libdaemon.scm
(libdaemon)[native-inputs]: Add "config" when cross-compiling for
aarch64.
(libdaemon)[arguments]<#:phases>{update-config.sub}: When cross-compiling
for aarch64, update the "config.sub" script.
---
gnu/packages/libdaemon.scm | 42 +++++++++++++++++++++++++++++-------------
1 file changed, 29 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/libdaemon.scm b/gnu/packages/libdaemon.scm
index e47d66c..9dc851e 100644
--- a/gnu/packages/libdaemon.scm
+++ b/gnu/packages/libdaemon.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -17,8 +18,10 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages libdaemon)
+ #:use-module (gnu packages autotools)
#:use-module (guix licenses)
#:use-module (guix packages)
+ #:use-module (guix utils)
#:use-module (guix download)
#:use-module (guix build-system gnu))
@@ -45,21 +48,34 @@
"0d5qlq5ab95wh1xc87rqrh1vx6i8lddka1w3f1zcqvcqdxgyn8zx"))
(file-name (string-append name "-" version ".tar.gz"))))
(build-system gnu-build-system)
- (arguments
- (if (%current-target-system)
- ;; The 'setpgrp' test cannot provide an answer when cross-compiling,
- ;; so provide the right one for glibc.
- `(#:configure-flags (list "ac_cv_func_setpgrp_void=yes"
-
- ;; TODO: Move this globally on the next
- ;; rebuild cycle.
- ;; Set a valid localstatedir for the
- ;; benefit of the default
- ;; 'daemon_pid_file_proc', used by the
- ;; Hurd's console client.
- "--localstatedir=/var"))
+ (native-inputs
+ (if (and=> (%current-target-system) target-aarch64?)
+ `(("config" ,config)) ; for config.sub
'()))
+ (arguments
+ `(,@(if (%current-target-system)
+ ;; The 'setpgrp' test cannot provide an answer when
cross-compiling,
+ ;; so provide the right one for glibc.
+ `(#:configure-flags (list "ac_cv_func_setpgrp_void=yes"
+ ;; TODO: Move this globally on the next
+ ;; rebuild cycle.
+ ;; Set a valid localstatedir for the
+ ;; benefit of the default
+ ;; 'daemon_pid_file_proc', used by the
+ ;; Hurd's console client.
+ "--localstatedir=/var"))
+ '())
+ ,@(if (and=> (%current-target-system) target-aarch64?)
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'update-config.sub
+ (lambda _
+ ;; Replace outdated config.sub such that aarch64
+ ;; will be recognised as an architecture.
+ (delete-file "config.sub")
+ (symlink (which "config.sub") "config.sub")))))
+ '())))
;; XXX: Stale URL, missing replacement. See <http://bugs.gnu.org/18639>.
(home-page "http://0pointer.de/lennart/projects/libdaemon/")
- 07/52: gnu: nspr: Don't retain references to native inputs., (continued)
- 07/52: gnu: nspr: Don't retain references to native inputs., guix-commits, 2021/09/20
- 11/52: build-system/glib-or-gtk: Support cross-compilaton., guix-commits, 2021/09/20
- 23/52: gnu: heimdal: Fix inputs when cross-compiling., guix-commits, 2021/09/20
- 24/52: gnu: heimdal: Fix linking error when cross-compiling., guix-commits, 2021/09/20
- 12/52: gnu: dbus-cairo: Add missing bash-minimal input., guix-commits, 2021/09/20
- 18/52: gnu: bdb: Fix cross-compilation build errors., guix-commits, 2021/09/20
- 06/52: gnu: nspr: Adjust to Mozilla cross-compilation conventions., guix-commits, 2021/09/20
- 13/52: gnu: polkit: Prevent cross-compilation build error., guix-commits, 2021/09/20
- 17/52: gnu: atk: Disable introspection when cross-compiling., guix-commits, 2021/09/20
- 16/52: gobject-introspection: Correct library name when cross-compiling., guix-commits, 2021/09/20
- 34/52: gnu: libdaemon: Support cross-compilation to aarch64-linux-gnu.,
guix-commits <=
- 35/52: gnu: avahi: Find 'TARGET-pkg-config' when cross-compiling., guix-commits, 2021/09/20
- 28/52: gnu: heimdal: Use libcom_err from input when cross-compiling., guix-commits, 2021/09/20
- 21/52: gnu: gamin: Fix 'configure' script when cross-compiling., guix-commits, 2021/09/20
- 09/52: gnu: poppler: Find pkg-config when cross-compiling., guix-commits, 2021/09/20
- 19/52: gnu: graphene: Don't build introspection data when cross-compiling., guix-commits, 2021/09/20
- 25/52: gnu: heimdal: Refer to cross-compiled bash., guix-commits, 2021/09/20
- 15/52: gobject-introspection: Fix inputs when cross-compiling., guix-commits, 2021/09/20
- 27/52: gnu: heimdal: Find tools when cross-compiling., guix-commits, 2021/09/20
- 32/52: gnu: json-glib: Don't build introspection data when cross-compiling., guix-commits, 2021/09/20
- 03/52: gnu: elogind: Fix cross-compilation., guix-commits, 2021/09/20