From patchwork Mon Jun 14 15:39:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30244 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 9794927BC81; Mon, 14 Jun 2021 16:47:57 +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_H4,RCVD_IN_MSPIKE_WL, 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 2604727BC78 for ; Mon, 14 Jun 2021 16:47:57 +0100 (BST) Received: from localhost ([::1]:57390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsood-0008WK-TT for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 11:47:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54632) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsog6-0003AQ-8r for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36077) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsog6-0007lX-0c for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsog5-0004Jy-VF for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 07/37] tzdata: Don't bother with cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:39:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368514316559 (code B ref 49025); Mon, 14 Jun 2021 15:39:05 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:39:03 +0000 Received: from localhost ([127.0.0.1]:47614 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsog2-0004Iq-TA for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:39:03 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:37390) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsog0-0004Ah-O0 for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:39:01 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by albert.telenet-ops.be with bizsmtp id H3f02500A0mfAB4063f0PC; Mon, 14 Jun 2021 17:39:00 +0200 Message-ID: From: Maxime Devos Date: Mon, 14 Jun 2021 17:39:00 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685140; bh=MlMuHMqYDzhc6XFq5e0TxsPJU9BAD9W8k4lWlfe8A48=; h=Subject:From:To:Date:In-Reply-To:References; b=KjI9MyRuMv7cSsiIR8WKuFPzOlydhPy0pX6ARFXrEGBLpYIYzyURSgtZssrMNlBWF UTerOK+f8eT0HyTjnRWxKIOr0k3Wtb/3vuOL/nZFCgsnp5hBWbL1sVr6wHgXp4f5Rk I5td4NeUNxwgZAP0+ecN7TbTRIzj1A3qEwHd5QA0Rn6e4rQZFjM+fdD5EY3fFv36qV ICA2o+t9mZfWavQcBwzqUS61P+wuzBHnDSBYhswrxCQLtWGYSgE5rTC2Bzc7pEQhEu WpjiVHTqDB2xnmybb03sT/M9BY94aH0Zti53olawVKDLNzIbYHE4x2PRzHa9fLDOHU twWgBA+oNY6Tw== 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 time zone database is architecture-independent, so trying to cross-compile it is pointless! * gnu/packages/base.scm (tzdata)[arguments]<#:target>: Set to #f. (tzdata)[allowed-references]: Only include the "out" output itself, to make sure no (architecture-dependent) binaries are installed. --- gnu/packages/base.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index d30299a7b6..2674be8048 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2020 Vitaliy Shatrov ;;; Copyright © 2020 Chris Marusich ;;; Copyright © 2021 Leo Le Bouter +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -1251,6 +1252,14 @@ command.") (build-system gnu-build-system) (arguments `(#:tests? #f + ;; This consists purely of (architecture-independent) data, + ;; so ‘cross-compilation’ is pointless here! + ;; (The binaries zic, dump, and tzselect are deleted in the post-install + ;; phase.) + #:target #f + ;; share/zoneinfo/posix is a symlink to share/zoneinfo, + ;; so include the package itself in #:allowed-references. + #:allowed-references ("out") #:make-flags (let ((out (assoc-ref %outputs "out")) (tmp (getenv "TMPDIR"))) (list (string-append "TOPDIR=" out)