From patchwork Wed Aug 25 18:03:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 32274 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 0859627BBE1; Wed, 25 Aug 2021 19:05:55 +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 C179927BBE1 for ; Wed, 25 Aug 2021 19:05:54 +0100 (BST) Received: from localhost ([::1]:32912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxHd-0003Fp-U3 for patchwork@mira.cbaines.net; Wed, 25 Aug 2021 14:05:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58516) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIxG1-00086W-04 for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36189) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIxG0-0000vc-BV for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mIxG0-0002pV-3L for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH 21/52] gnu: gamin: Fix 'configure' script when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Aug 2021 18:04:12 +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.162991464410738 (code B ref 50201); Wed, 25 Aug 2021 18:04:12 +0000 Received: (at 50201) by debbugs.gnu.org; 25 Aug 2021 18:04:04 +0000 Received: from localhost ([127.0.0.1]:47714 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFs-0002my-7u for submit@debbugs.gnu.org; Wed, 25 Aug 2021 14:04:04 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:55644) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFa-0002hZ-I7 for 50201@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:47 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id lu3k2500G0mfAB401u3l8k; Wed, 25 Aug 2021 20:03:45 +0200 From: Maxime Devos Date: Wed, 25 Aug 2021 20:03:01 +0200 Message-Id: <20210825180332.5720-21-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=1629914625; bh=PgicG7AECq7NewogSnSMkiqQVLyXZkMWQ/ved/dUa1Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Jdon/zTc7brGfBWzFQ+591eN5LIr+OeO2W9nM7mmeKhmUic7GUgP+PYOoBRh3emrv DUjd504+xbOndU+3giABukJabGb5ynfUhjjwekdd4NxbE8kZmuK8jztgGc3LWdTN6s 53/1CUlIvyobpRQHybtkqaZjBRzSTNdVK21ojV2bH1WvpScOtVZLgc+IR+/+3PUot2 RtLvWDbFSqbkKJlIhtEVKrsKsnX5zeLPtcp45ZO6dX79kgoOVdhaQB0LKQ3V5gD5Ln N8RoqWGgEW7CqTDxPhbDPS8AWSAJH0dcbmp7ahl4k73waH5eQhjPWe2Gp/YQIOMDpu hKbmqcG1IcOSA== 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 * gnu/packages/gnome.scm (gamin)[arguments]<#:phases>{set-have-abstract-sockets}: Override test for ‘abstract sockets’ when cross-compiling. --- gnu/packages/gnome.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c9ccfad6f2..3f7dcb7988 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11088,7 +11088,31 @@ repository and commit your work.") "server/gam_node.h" "server/gam_subscription.c") (("G_CONST_RETURN") "const")) - #t))))) + #t)) + ;; The configure script runs a test program unconditionally, + ;; without an option to manually set the test result. + ;; Override this test anyway. + ,@(if (%current-target-system) + `((add-after 'bootstrap 'set-have-abstract-sockets + (lambda _ + (define in-abstract-sockets-test? #f) + (substitute* "configure" + (("^#### Abstract sockets\n$") + (set! in-abstract-sockets-test? #t) + "#### Abstract sockets\n") + (("^have_abstract_sockets=no\n$") + (set! in-abstract-sockets-test? #f) + ;; ‘Abstract sockets’ appear to be Linux-only. + (string-append "have_abstract_sockets=" + ,(if (target-linux?) + "yes" + "no") + "\nif false; then\nif false; then :\n")) + (("^(.*\n)$" line) + (if in-abstract-sockets-test? + "" ; delete + line)))))) + '())))) (inputs `(("glib" ,glib))) (native-inputs