guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

35/52: gnu: avahi: Find 'TARGET-pkg-config' when cross-compiling.


From: guix-commits
Subject: 35/52: gnu: avahi: Find 'TARGET-pkg-config' when cross-compiling.
Date: Mon, 20 Sep 2021 07:19:36 -0400 (EDT)

mothacehe pushed a commit to branch core-updates-frozen
in repository guix.

commit 0515ebb0d17f4350b094cace66d5469640029da7
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Wed Aug 25 12:42:23 2021 +0200

    gnu: avahi: Find 'TARGET-pkg-config' when cross-compiling.
    
    The configure script first tests whether "pkg-config" is in PATH,
    and then uses "TARGET-pkg-config".  Pretend "pkg-config" exists.
    
    * gnu/packages/avahi.scm (avah)[arguments]<#:configure-flags>: Set
      ac_cv_prog_have_pkg_config=yes when cross-compiling.
---
 gnu/packages/avahi.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm
index 602f9d7..5582df4 100644
--- a/gnu/packages/avahi.scm
+++ b/gnu/packages/avahi.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -58,7 +59,7 @@
                  #t))))
     (build-system gnu-build-system)
     (arguments
-     '(#:configure-flags '("--with-distro=none"
+     `(#:configure-flags '("--with-distro=none"
                            "--disable-static"
                            "--localstatedir=/var" ; for the DBus socket
                            "--disable-python"
@@ -68,7 +69,10 @@
                            "--enable-tests"
                            "--disable-qt4" "--disable-qt5"
                            "--disable-gtk" "--disable-gtk3"
-                           "--enable-compat-libdns_sd")))
+                           "--enable-compat-libdns_sd"
+                           ,@(if (%current-target-system)
+                                 '("ac_cv_prog_have_pkg_config=yes")
+                                 '()))))
     (inputs
      `(("dbus" ,dbus)
        ("expat" ,expat)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]