From patchwork Mon Jul 8 09:59:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 14522 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 860A9171D4; Mon, 8 Jul 2019 11:02:51 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 4E579171D2 for ; Mon, 8 Jul 2019 11:02:51 +0100 (BST) Received: from localhost ([::1]:40042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkQTy-0006WQ-Uj for patchwork@mira.cbaines.net; Mon, 08 Jul 2019 06:02:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55183) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkQRh-0005jY-55 for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkQRf-0003Nt-4a for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:29 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49077) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hkQRe-0003NQ-Vh for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:27 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hkQRe-0004xI-T9 for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:26 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH 31/31] gnu: glibc-utf8-locales: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jul 2019 10:00:26 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36477 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 36477@debbugs.gnu.org Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.156258002318991 (code B ref 36477); Mon, 08 Jul 2019 10:00:26 +0000 Received: (at 36477) by debbugs.gnu.org; 8 Jul 2019 10:00:23 +0000 Received: from localhost ([127.0.0.1]:57888 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkQRa-0004w7-Nz for submit@debbugs.gnu.org; Mon, 08 Jul 2019 06:00:23 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:51974) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkQRA-0004pl-Nw for 36477@debbugs.gnu.org; Mon, 08 Jul 2019 05:59:57 -0400 Received: by mail-wm1-f67.google.com with SMTP id 207so15097225wma.1 for <36477@debbugs.gnu.org>; Mon, 08 Jul 2019 02:59:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lq9QjQ/9TLT9FgCyr+wQuaOoWg8YHp7Vn2a0TGg4oxY=; b=hAFNxhj/2gtMOEBANgchPZwPvvRCNOzyaFs2nhLpdObH+kfuTAU0xE6+CHLVX2gTvj l98iiemS6gw1DwOTz3yjYz7UH0Lj2Xwz9y5BMON/dkf9MYu4dQ+9QTXJfOH24N9poFK/ P+u6v99d6EqkeFdLv7JgHqE0oWJeMfUdZthFshQbP6mG3QolUfGABXjpUe3vrLJCfeUy cJNUd+sIvWNvr2AOE/dvnpgNiZYHyRzHLETupYOsmk88fGBpEHHo5+fA6c9ik1A27CK/ xnf3NVH46xMKtwcHKRwnRnc5WNK9XADEFfpFfeuc3B5VMIpDXe/a3A14lE6aH7PMMops tZEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=lq9QjQ/9TLT9FgCyr+wQuaOoWg8YHp7Vn2a0TGg4oxY=; b=HH6W0Am8s58lFaN3cX6QYqRLbGoAsMuTP6e1z+D2BDPZOsgsCJrGsAHTbfVeCW30CT wY4/N2TekZkP/+FwNWNKUuv1oer5D719ir6IAWswkNG/hAoXcrLRW0QyKOl8f8FaSmiR JGS82qYk+r2VDcItXi/p8eG4mrBASdZbiHiUBDY+8mD5cR+PRbrJMJFZX4URSRO6Xjui d9JuOcdO6UkgZZUNxWDTQ/rFBvBn57T9PXL1D6B7guQlVL8peJp38eWwamdZzODX84pV QcTM+pTWz+BC43V//XIEQiDl/JG5Qpbu5PJMvxwosrljx5bXG+TrDUHZ8n4Ojqska262 2TiA== X-Gm-Message-State: APjAAAU1z3AsDjS/PZWW+2LuQcx1Cx+3tMqshXVSHJCHsQTGQqYT4IxS MrOtcjsJsNR4P3Q+2ZFTtEn1yVYF X-Google-Smtp-Source: APXvYqzx/4LFUjIqUf3t/g9EDl20HkLdbBp1KdLJiFebk2b+QDl9qa91QZNecQXMCe5JtKiZ7NRMOg== X-Received: by 2002:a1c:2314:: with SMTP id j20mr15969705wmj.152.1562579990589; Mon, 08 Jul 2019 02:59:50 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id i66sm3165127wmi.11.2019.07.08.02.59.49 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 08 Jul 2019 02:59:49 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 8 Jul 2019 11:59:13 +0200 Message-Id: <20190708095913.3460-32-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190708095913.3460-1-m.othacehe@gmail.com> References: <20190708095913.3460-1-m.othacehe@gmail.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mathieu Othacehe Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/base.scm (glibc-utf8-locales)[inputs]: Move to ... [native-inputs]: ... here, in order to fix cross-compilation. * gnu/packages/commencement.scm (glibc-utf8-locales-final)[inputs]: Move to ... [native-inputs]: ... here, in order to fix cross-compilation. --- gnu/packages/base.scm | 4 ++-- gnu/packages/commencement.scm | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 15f35009a9..216a2f1591 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1143,8 +1143,8 @@ to the @code{share/locale} sub-directory of this package.") ;; tests---e.g., in Guile's i18n tests. '("de_DE" "el_GR" "en_US" "fr_FR" "tr_TR")) #t)))) - (inputs `(("glibc" ,glibc) - ("gzip" ,gzip))) + (native-inputs `(("glibc" ,glibc) + ("gzip" ,gzip))) (synopsis "Small sample of UTF-8 locales") (description "This package provides a small sample of UTF-8 locales mostly useful in diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index a8ec677cee..c0345aa967 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -881,11 +881,12 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; function.) (package (inherit glibc-utf8-locales) - (inputs `(("glibc" ,glibc-final) - ("gzip" - ,(package-with-explicit-inputs gzip %boot4-inputs - (current-source-location) - #:guile %bootstrap-guile)))))) + (native-inputs + `(("glibc" ,glibc-final) + ("gzip" + ,(package-with-explicit-inputs gzip %boot4-inputs + (current-source-location) + #:guile %bootstrap-guile)))))) (define-public ld-wrapper ;; The final 'ld' wrapper, which uses the final Guile and Binutils.