From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id YJG4Cr6HJmF/nwAAgWs5BA (envelope-from ) for ; Wed, 25 Aug 2021 20:11:10 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id EP5KBr6HJmGQeAAAB5/wlQ (envelope-from ) for ; Wed, 25 Aug 2021 18:11:10 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id EB0452BEC0 for ; Wed, 25 Aug 2021 20:11:09 +0200 (CEST) Received: from localhost ([::1]:37960 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxMi-0006uj-VE for larch@yhetil.org; Wed, 25 Aug 2021 14:11:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60700) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIxMc-0006rh-W5 for guix-patches@gnu.org; Wed, 25 Aug 2021 14:11:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36291) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIxMc-0005xX-Os for guix-patches@gnu.org; Wed, 25 Aug 2021 14:11:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mIxMc-00037T-KQ for guix-patches@gnu.org; Wed, 25 Aug 2021 14:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH 36/52] gnu: avahi: Use the cross-compiled bash. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Aug 2021 18:11:02 +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.162991504011933 (code B ref 50201); Wed, 25 Aug 2021 18:11:02 +0000 Received: (at 50201) by debbugs.gnu.org; 25 Aug 2021 18:10:40 +0000 Received: from localhost ([127.0.0.1]:47830 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxMG-00036E-5X for submit@debbugs.gnu.org; Wed, 25 Aug 2021 14:10:40 -0400 Received: from newton.telenet-ops.be ([195.130.132.45]:38024) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxME-00035k-Qa for 50201@debbugs.gnu.org; Wed, 25 Aug 2021 14:10:39 -0400 Received: from laurent.telenet-ops.be (laurent.telenet-ops.be [IPv6:2a02:1800:110:4::f00:19]) by newton.telenet-ops.be (Postfix) with ESMTPS id 4Gvv43322qzMr08F 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 lu3k2500G0mfAB401u3n9P; Wed, 25 Aug 2021 20:03:47 +0200 From: Maxime Devos Date: Wed, 25 Aug 2021 20:03:16 +0200 Message-Id: <20210825180332.5720-36-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 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1629914627; bh=YX9wfBKkm73EwTOS0vcYLp+PG3tPEb2OsLbGo8MTGEk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ptV4OXs17cVOhjxdsVsBoFWDtDye1fZgw0mJE2I46yDQW2EkFm7gzv8hLLd5I3UHr EpAFoTp9iC/Ppn81yk6NNME9i1sM21e5e0n/Uk+a/TGFaP7QiWvtTKHko21szbWca+ if21Tq7zonnGnxo0siJl9LAzIGkJ3INgYGfXIAlUcIcPzr0rmGQltT2f0oic7PZyM1 hnhXW7YpHd8XPkL1LSCWfpTlH5t/z2BvElLZLeRO3X+mHWbRxunAI7bkz3B5O16zDg 9DQsH5tSvGutyPzZu8Zyi6m4yjFYmq4WWCUVwj1GXyqoPwGOz/JG1YbbZDv50TKx2M hB3St15NeiU0g== 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1629915070; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=YX9wfBKkm73EwTOS0vcYLp+PG3tPEb2OsLbGo8MTGEk=; b=LuwfqaqEDz2AoGTwCBodpFHT1r1jirLEG7fBZrm3FzlQxHem3X93LD7qLNha2xHiqH5Zcz /xmNBT5znhLEkUyO3nWbdN1QRW4UhcwNwFmsfza/eXDZeM8kCKzxJRzwaEL8gL6UiP0iz7 lxEUV5zg7zshzcJaIbpglqXHc+umMAy6D07QXJX3w54YTKVvTFkliCQU+bOx4zWvpgCm2H ZFnw0AXfBrcuAWYtxA2/3PzChIjXb0hzKecR38q/NpO4i8F/RuIsm1yBf4neYy3jEDWsPv Vyjjxj09ZEoqUE/N5DDGbzOn6mVogpXm92G2HlirbaSCJybo/9E6VAS0MLfe4A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1629915070; a=rsa-sha256; cv=none; b=Ww0VNpEc9ToeVMKNqBffYpsyc9uhY7XWN3I/JigIFQ5OO/NAbeApt0kNPBJmAaC1Vg4WSJ YdaBwiVguxZUo5ursqFja3Aq/HdpbwuXO1hyYnpUNThmrQOLBdIiSRPZI+dCzFKTX9IQaZ 19CG0OhiG6V6+kfRFRQBmDQLNcqQlyeCqo/s9Zt+yeH1cgmhqQuvACS3FONpo5K/Pi7kLd IEtobiX4rE2dAXHcvhZD2f7CSa4yktfZANldNdm/v52YfeMKW4FOdkqMnMrKPvqlMd16HR vqgCnAco77JXbDNCoeNohte6NDO0LeHIjlPYCx/yczCZ3D8XZZFQdWoniAAnsw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=ptV4OXs1; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.68 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=ptV4OXs1; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: EB0452BEC0 X-Spam-Score: 3.68 X-Migadu-Scanner: scn0.migadu.com X-TUID: qLksF3sQIP/q * 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