From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id KJ6CGy2GJmE7mAAAgWs5BA (envelope-from ) for ; Wed, 25 Aug 2021 20:04:29 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id QC8aFy2GJmEFbQAAB5/wlQ (envelope-from ) for ; Wed, 25 Aug 2021 18:04:29 +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 233E4700F for ; Wed, 25 Aug 2021 20:04:29 +0200 (CEST) Received: from localhost ([::1]:55964 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxGG-0008Dg-6W for larch@yhetil.org; Wed, 25 Aug 2021 14:04:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58488) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIxG0-000860-RD for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36186) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIxFz-0000ur-2M for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mIxFy-0002p9-U0 for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH 20/52] gnu: gamin: Recognise aarch64 as architecture 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:10 +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.162991464310703 (code B ref 50201); Wed, 25 Aug 2021 18:04:10 +0000 Received: (at 50201) by debbugs.gnu.org; 25 Aug 2021 18:04:03 +0000 Received: from localhost ([127.0.0.1]:47707 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFq-0002mP-RV for submit@debbugs.gnu.org; Wed, 25 Aug 2021 14:04:03 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:50912) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFZ-0002hI-H9 for 50201@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:46 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id lu3d2500J0mfAB406u3kUg; Wed, 25 Aug 2021 20:03:44 +0200 From: Maxime Devos Date: Wed, 25 Aug 2021 20:03:00 +0200 Message-Id: <20210825180332.5720-20-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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1629914624; bh=NaQcIAZPf+RJCegsKDeLmqPWhn9iSmDRyrLuF2rEe2g=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=j3AGH/WVtiR8CUYHFMbK6YIsokMllRKtnV72gTxLERLKmhqAScmcERAHaOPZqNQxQ Frgo3NsXSQh/4gaZxLmbGNk9H3Rg1mRoe7EfJgRQ1ngKwA+RT7AfU0D7JiL0L2ib/+ P7wl7TsYG0SwFb7QUI7rdXSIu/aFlDi0A4B/pV6Y5VFrkXkcBEioTIl+Q/JkegnD9f +BEMlRFd+1p3n1WHqZZ+mM+zQGt1WsCB6LVZ6nddxRPWCDIsghlrBucxav1o6JLVkj o6MaZkeVZlKcAudL5/f2ArZtGx9I/obnqXoflis1Vr/AN3/Od2olqKpntq1U+LBAY9 R/IFd0ig9UO3Q== 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=1629914669; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=NaQcIAZPf+RJCegsKDeLmqPWhn9iSmDRyrLuF2rEe2g=; b=ePmx6yJGI9pW0a3ejbQwSmGXtRxobK+jkE4MdtnQlU34w8iSuuo4wsV4/Km5aIt8Atw/FH v063TvnlEjTH5rzt155eVR0wtH0eue3lxE7lQVTdw2KLT2l5DXNXX/lcL0mg7SmWfIqLHZ B5xXmbXGq8iR105An/mwln7HxFaX/6AwjgnFKQKc+FnFaaT7K5KHCVAeKeQp8NaHHvbenE j7caaOgXT7MRMfp/GaWPc6bT25xYc95ob7JnitdeiFrSi1N97GTYhufFQ9S8ZGxKP94BfR l1IvYib3ZQxZg1hlczDF9P4LkWvR4jI1npvrh+YyiwpRkjS66VTwUc1j0/4ZIw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1629914669; a=rsa-sha256; cv=none; b=VuvFIUfTCsd9bWoQgiTZsss0KutWqCPJf4dLr7qZ2FH8WtlTxn0xt9PN0Ov9kbZ5sPgqEw ZGR5ONZCoNCxuoAYC8bJhyrsAmXY7r5qFnHsW8lgg05l1wAcC7yL36aklj3v0RfPde6JsB lVqzg4qVK7BzlpvyPVEB3ChO5bImEP+HqR1uQD1mM6VXDDbtRcPVCorCZEHqogYCUaquwp LdhZXXawiu7Id5RUUKxerHB/eO+h7t5NMZsH+CcOk/Uhu6Nz4AsyepOvSwP6sl/bEin8JA oS454LsvCr5kbdUD0Lz+spt2xgQMj5NzAM0CCJMZtVx6NUZoeKKQovKsd21ZDg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b="j3AGH/WV"; 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: -0.33 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b="j3AGH/WV"; 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: 233E4700F X-Spam-Score: -0.33 X-Migadu-Scanner: scn0.migadu.com X-TUID: JQWt9pi1GIDK * gnu/packages/gnome.scm (gamin)[arguments]<#:phases>{replace-config.sub}: Update 'config.sub' when cross-compiling. (gamin)[native-inputs]: Add "config" when cross-compiling. --- gnu/packages/gnome.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b23fe4a662..c9ccfad6f2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -60,6 +60,7 @@ ;;; Copyright © 2020, 2021 Sébastien Lerique ;;; Copyright © 2021 Trevor Hass ;;; Copyright © 2021 Solene Rapenne +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -11073,6 +11074,13 @@ repository and commit your work.") (arguments `(#:phases (modify-phases %standard-phases + ;; The 'config.sub' is too old to recognise aarch64. + ,@(if (and=> (%current-target-system) target-aarch64?) + `((add-after 'unpack 'replace-config.sub + (lambda _ + (delete-file "config.sub") + (symlink (which "config.sub") "config.sub")))) + '()) (add-after 'unpack 'remove-deprecated-macro (lambda _ (substitute* '("server/gam_node.c" @@ -11084,7 +11092,10 @@ repository and commit your work.") (inputs `(("glib" ,glib))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ,@(if (and=> (%current-target-system) target-aarch64?) + `(("config" ,config)) + '()))) (home-page "https://people.gnome.org/~veillard/gamin/") (synopsis "File alteration monitor") (description -- 2.33.0