[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#50201] [PATCH 36/52] gnu: avahi: Use the cross-compiled bash.
From: |
Maxime Devos |
Subject: |
[bug#50201] [PATCH 36/52] gnu: avahi: Use the cross-compiled bash. |
Date: |
Wed, 25 Aug 2021 20:03:16 +0200 |
* gnu/packages/avahi.scm (avahi)[arguments]<#:phases>{patch-more-shebangs}:
Replace the bash in the shebangs in "/etc/avahi" with a cross-compiled bash.
---
gnu/packages/avahi.scm | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm
index 5582df479e..7dcaa17a76 100644
--- a/gnu/packages/avahi.scm
+++ b/gnu/packages/avahi.scm
@@ -23,9 +23,11 @@
(define-module (gnu packages avahi)
#:use-module ((guix licenses) #:select (lgpl2.1+))
#:use-module (guix packages)
+ #:use-module (guix gexp)
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (gnu packages)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages dbm)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
@@ -72,9 +74,28 @@
"--enable-compat-libdns_sd"
,@(if (%current-target-system)
'("ac_cv_prog_have_pkg_config=yes")
- '()))))
+ '()))
+ ;; TODO(core-updates): Make this unconditional.
+ ,@(if (%current-target-system)
+ `(#:modules ((srfi srfi-26)
+ (guix build utils)
+ (guix build gnu-build-system))
+ #:phases
+ ,#~(modify-phases %standard-phases
+ (add-after 'patch-shebangs 'patch-more-shebangs
+ (lambda* (#:key inputs #:allow-other-keys)
+ (define path
+ `(,(dirname (search-input-file inputs "bin/sh"))))
+ (for-each
+ (cut patch-shebang <> path)
+ (find-files (string-append #$output
"/etc/avahi")))))))
+ '())))
(inputs
- `(("dbus" ,dbus)
+ ;; TODO(core-updates): Make this input unconditional.
+ `(,@(if (%current-target-system)
+ `(("bash-minimal" ,bash-minimal))
+ '())
+ ("dbus" ,dbus)
("expat" ,expat)
("gdbm" ,gdbm)
("glib" ,glib)
--
2.33.0
- [bug#50201] [PATCH 42/52] gnu: libxi: Add --disable-malloc0-returnsnull when necessary., (continued)
- [bug#50201] [PATCH 42/52] gnu: libxi: Add --disable-malloc0-returnsnull when necessary., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 47/52] gnu: wayland: Find docbook-xml when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 50/52] gnu: gdk-pixbuf: Add bash-minimal input when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 52/52] gnu: at-spi2-atk: Don't compile tests when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 33/52] gnu: libthai: Add datrie as native-input when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 43/52] gnu: libxrandr: Add --disable-malloc0-returnsnull when necessary., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 51/52] gnu: pango: Add bash-minimal input when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 37/52] gnu: at-spi2-core: Don't cross-compile documentation., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 35/52] gnu: avahi: Find 'TARGET-pkg-config' when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 32/52] gnu: json-glib: Don't build introspection data when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 36/52] gnu: avahi: Use the cross-compiled bash.,
Maxime Devos <=
- [bug#50201] [PATCH 49/52] gnu: gdk-pixbuf: Find docbook when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 45/52] gnu: Add pkg-config-for-build., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 34/52] gnu: libdaemon: Support cross-compilation to aarch64-linux-gnu., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH core-updates-frozen 0/52] Support cross-compilation in glib-or-gtk-build-system and fix cross-compilation errors, Mathieu Othacehe, 2021/08/28
- [bug#50201] [PATCH core-updates-frozen 0/52] Support cross-compilation in glib-or-gtk-build-system and fix cross-compilation errors, Maxime Devos, 2021/08/30