From patchwork Sat Jun 19 15:04:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30493 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 ADD3127BC83; Sat, 19 Jun 2021 16:09:18 +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,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 59A7D27BC78 for ; Sat, 19 Jun 2021 16:09:18 +0100 (BST) Received: from localhost ([::1]:57888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucaz-0004qq-F6 for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:09:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56578) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucXu-0007n9-5i for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48871) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucXt-0007rC-TG for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucXt-0005eI-Ob for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 07/36] tzdata: Don't bother with cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06: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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411512321419 (code B ref 49025); Sat, 19 Jun 2021 15:06:05 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:05:23 +0000 Received: from localhost ([127.0.0.1]:60358 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXC-0005ZJ-Hf for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:22 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59164) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX0-0005VD-W9 for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:11 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135Aod; Sat, 19 Jun 2021 17:05:10 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:29 +0200 Message-Id: <20210619150458.12057-8-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115110; bh=njv2jZR1vpk0wCCZRTmIX/86vA9G6pfaRGoIB44zAdM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=K79HqeJ8yb/yrIk5mSGWEvEJYPwJNzmMBOcGhMUw4Ev4FPJDaSe2Ws/EXruqOEY5Z PxXVvKQCkmvD7mAcni26Fg8vnC+OSdo9PlFwfUP2LzCLv9NqS6d7IeUTvU0WPfZnfG Km8min2X51726I8x21FrJNWAVKSUBUgedWZ++oen/chyVzkgsz714DNxfL9yh20v6a b0uoDwVbhJ7cXFSfbsj/blSTbl8U4gn4gdxlnaV28iYF2jAoXN3p1nhZV0VpczC918 dZ3mfc3prBbEaOXLBTeXkdnhCZgWB2pczD4lkgQCA7P8wied0rf74874qjCOEOIdGk qQ1DRfs/5KqFg== 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 edc4c4a427..62d6822750 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. ;;; @@ -1255,6 +1256,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)