From patchwork Wed Aug 25 18:03:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 32294 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 024E927BBE1; Wed, 25 Aug 2021 19:10:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6AF4927BBE3 for ; Wed, 25 Aug 2021 19:10:22 +0100 (BST) Received: from localhost ([::1]:37412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxLx-0006U2-Ha for patchwork@mira.cbaines.net; Wed, 25 Aug 2021 14:10:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60476) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIxLg-00063T-8B for guix-patches@gnu.org; Wed, 25 Aug 2021 14:10:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36269) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIxLf-0005E5-UW for guix-patches@gnu.org; Wed, 25 Aug 2021 14:10:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mIxLf-00034l-PU for guix-patches@gnu.org; Wed, 25 Aug 2021 14:10:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH 35/52] gnu: avahi: Find 'TARGET-pkg-config' when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Aug 2021 18:10:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50201 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50201@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50201-submit@debbugs.gnu.org id=B50201.162991497811754 (code B ref 50201); Wed, 25 Aug 2021 18:10:03 +0000 Received: (at 50201) by debbugs.gnu.org; 25 Aug 2021 18:09:38 +0000 Received: from localhost ([127.0.0.1]:47811 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxLG-00033W-J7 for submit@debbugs.gnu.org; Wed, 25 Aug 2021 14:09:38 -0400 Received: from leibniz.telenet-ops.be ([195.130.137.77]:52092) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxLC-00032U-9T for 50201@debbugs.gnu.org; Wed, 25 Aug 2021 14:09:36 -0400 Received: from laurent.telenet-ops.be (laurent.telenet-ops.be [IPv6:2a02:1800:110:4::f00:19]) by leibniz.telenet-ops.be (Postfix) with ESMTPS id 4Gvv4328Z6zMqhbg for <50201@debbugs.gnu.org>; Wed, 25 Aug 2021 20:03:47 +0200 (CEST) Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id lu3k2500G0mfAB401u3n9M; Wed, 25 Aug 2021 20:03:47 +0200 From: Maxime Devos Date: Wed, 25 Aug 2021 20:03:15 +0200 Message-Id: <20210825180332.5720-35-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210825180332.5720-1-maximedevos@telenet.be> References: <20210825180332.5720-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1629914627; bh=NF4bBhNIRWZ3tNhawPkP9cYxSSubIgpeB5iaYIJhqIs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ot7dF3qRRUGNr48sNxdyU+xQGfRswGySXhh8yaPEH9/VOQkZYAxh9v1HzBqYUwWE7 ARfR4PjuhbQCOQmPHU3wKeIWJWstEQw8sysg3giqVX7Vid/+w5UnYi0fg3PLtsrnpU izudMMr+ePh5P0mNYgMCpEEirjZhNdR/Zh582Kpos4pymM45RW2VZYPCl0suYRF8eh bMvReIUbba/V85rVgTQeakvmRfYCkHwEcwTppnMu45Sql0ltxI8Q8iseuHeMA6jKYt 1LOVvTP1yr14GRTwehlT9oSvnWkdWGXymkSGGHm9w/s67GFg71vn3r3kzGebFe2VB0 YkFeySrq/twcw== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 602f9d7997..5582df479e 100644 --- a/gnu/packages/avahi.scm +++ b/gnu/packages/avahi.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2021 Maxime Devos ;;; ;;; 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)