From patchwork Mon Sep 2 15:32:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15227 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 8F7881734D; Mon, 2 Sep 2019 16:35:08 +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 5227417329 for ; Mon, 2 Sep 2019 16:35:08 +0100 (BST) Received: from localhost ([::1]:37574 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oME-000224-OO for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:35:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42167) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oLS-0001Ph-Tn for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oLQ-0002wL-U7 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49927) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oLQ-0002um-DY for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:16 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oLQ-0006UD-77 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 14/48] gnu: glibc-utf8-locales: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:34:16 +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.156743845124888 (code B ref 36477); Mon, 02 Sep 2019 15:34:16 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:11 +0000 Received: from localhost ([127.0.0.1]:58738 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLK-0006T0-B4 for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:10 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:36440) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLC-0006Pc-IS for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:03 -0400 Received: by mail-wr1-f67.google.com with SMTP id y19so14465339wrd.3 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:02 -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 :mime-version:content-transfer-encoding; bh=oR0O2ITFHC3dR1dw6cRrC8+PxeIBzLUwTsqQ352esIE=; b=qGJvIFCM5PK3O6oHlpQsOMg/ffkloXtnHFg72PJ9MDV0x81ahykhawuuKUEXOdEfUV Lks8QnLz07RN/lPv4pM4MaP85zbsJpsluKdT//VvWOotKjZQWjQjDtAOAXFsU53ldZbb /PCarDiv1ioH/+ohImubv0/R6Jf54Wx6WrSXAQtkh+naXflUEdLkImidau2YjisKbMtn yJCRvDIwLzE5+TvhTH4pTl8aIbbMuAnr7vvAqIfOhfy2q4WVmtlAhBoN2kmYjL/nUifF OfYHGljX+PQfBXOagfRaFOacOzRFO8DaoWnRBe4Rf76CvryrjF6PfutmNHU6Ijfg3dGW 7Spw== 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:mime-version:content-transfer-encoding; bh=oR0O2ITFHC3dR1dw6cRrC8+PxeIBzLUwTsqQ352esIE=; b=CYuDZhvk8Emjk7U4X/MuQVdIOt7mj7r24QzKnye6X2HQ7uNWl68lIwM2f00XG8WNrY wK6FDOqFomcxdcZoekg6RMnW8Z9NuvOscsezN/wjhUWtNkqR6kbecOSfvbZGdj/w+PI6 KSCF03GGmmQ3K9MUG98+AYfz6LbTpXQ3//feUdxfeOI1VoM0SnRAzn2O8M5VHay6WMv+ 19gnkvKJ1ZhtL2GcKFdyNV5mPRleWLwuCUFzxbmrxGMDbTRpUQIV1sfxUS1OfBUrGxru zaB/Z0IJ8Sf5keLdtGQ70UnGqIOeIu8zt5UpRVy7r1krnzCcMpqIvnWHYq6Qd8bj713v XACA== X-Gm-Message-State: APjAAAX2CsnMChnxEQCmBs7O7hlxsV/HVpxNIyfYj+n7ixKgQCJ5gu5U 5OOug5Mdy6/f2zqAL6M/ov7W8b/F X-Google-Smtp-Source: APXvYqw/wYT4q803rB7XjEL6qabShQ79K2U5WPAWR7Sl5xVyjkTSFX7Zso+h5mOEXozxmO24pr+oSQ== X-Received: by 2002:adf:f48e:: with SMTP id l14mr20767463wro.234.1567438436874; Mon, 02 Sep 2019 08:33:56 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.33.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:33:56 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:32:59 +0200 Message-Id: <20190902153333.11190-15-m.othacehe@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190902153333.11190-1-m.othacehe@gmail.com> References: <20190902153333.11190-1-m.othacehe@gmail.com> MIME-Version: 1.0 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 791647d848..ebaa93f092 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1112,8 +1112,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 69d1f87605..615d97dbd5 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2350,11 +2350,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.