From 77fe306c66eea88acd4b29dd0e60bbf9d7bae101 Mon Sep 17 00:00:00 2001 From: Janneke Nieuwenhuizen Date: Mon, 29 May 2023 08:49:45 +0200 Subject: [PATCH] gnu: avahi: Support for cross-building and the Hurd. * gnu/packages/avahi.scm (avahi)[inputs]: Include libcap only for supported systems and when not cross-building. [arguments]: Add --disable-autoipd when not using libcap. --- gnu/packages/avahi.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm index 65d3ede131..a2b5f256bc 100644 --- a/gnu/packages/avahi.scm +++ b/gnu/packages/avahi.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2023 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -73,6 +74,12 @@ (define-public avahi "--enable-compat-libdns_sd" ,@(if (%current-target-system) '("ac_cv_prog_have_pkg_config=yes") + '()) + ,@(if (or (%current-target-system) + (not (member (%current-system) + (package-supported-systems + libcap)))) + '("--disable-autoipd") '())) #:modules ((srfi srfi-26) (guix build utils) @@ -92,7 +99,13 @@ (define path ("expat" ,expat) ("gdbm" ,gdbm) ("glib" ,glib) - ("libcap" ,libcap) ;to enable chroot support in avahi-daemon + ;; Do not use libcap when cross-compiling since it's not quite + ;; cross-compilable; and use it only for supported systems. + ,@(if (and (not (%current-target-system)) + (member (%current-system) + (package-supported-systems libcap))) + `(("libcap" ,libcap)) ;to enable chroot support in avahi-daemon + '()) ("libdaemon" ,libdaemon) ("libevent" ,libevent))) (native-inputs