[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
21/52: gnu: gamin: Fix 'configure' script when cross-compiling.
From: |
guix-commits |
Subject: |
21/52: gnu: gamin: Fix 'configure' script when cross-compiling. |
Date: |
Mon, 20 Sep 2021 07:19:32 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates-frozen
in repository guix.
commit 3a8d342cdf5a929be1e6d36204d8f91e5684ce87
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Tue Aug 24 15:32:49 2021 +0200
gnu: gamin: Fix 'configure' script when cross-compiling.
* gnu/packages/gnome.scm
(gamin)[arguments]<#:phases>{set-have-abstract-sockets}: Override
test for ‘abstract sockets’ when cross-compiling.
---
gnu/packages/gnome.scm | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5e24090..0b2325b 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11259,7 +11259,31 @@ repository and commit your work.")
"server/gam_node.h"
"server/gam_subscription.c")
(("G_CONST_RETURN") "const"))
- #t)))))
+ #t))
+ ;; The configure script runs a test program unconditionally,
+ ;; without an option to manually set the test result.
+ ;; Override this test anyway.
+ ,@(if (%current-target-system)
+ `((add-after 'bootstrap 'set-have-abstract-sockets
+ (lambda _
+ (define in-abstract-sockets-test? #f)
+ (substitute* "configure"
+ (("^#### Abstract sockets\n$")
+ (set! in-abstract-sockets-test? #t)
+ "#### Abstract sockets\n")
+ (("^have_abstract_sockets=no\n$")
+ (set! in-abstract-sockets-test? #f)
+ ;; ‘Abstract sockets’ appear to be Linux-only.
+ (string-append "have_abstract_sockets="
+ ,(if (target-linux?)
+ "yes"
+ "no")
+ "\nif false; then\nif false; then :\n"))
+ (("^(.*\n)$" line)
+ (if in-abstract-sockets-test?
+ "" ; delete
+ line))))))
+ '()))))
(inputs
`(("glib" ,glib)))
(native-inputs
- 24/52: gnu: heimdal: Fix linking error when cross-compiling., (continued)
- 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, 2021/09/20
- 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 <=
- 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
- 04/52: gnu: libcap: Fix cross-compilation build failures., guix-commits, 2021/09/20
- 05/52: gnu: perl: Find 'bash' when cross-compiling., guix-commits, 2021/09/20
- 08/52: gnu: mozjs-60: Fix cross-compilation build errors., guix-commits, 2021/09/20