From patchwork Mon Jul 8 09:59:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 14518 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 71D63171D4; Mon, 8 Jul 2019 11:02:17 +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,URIBL_BLOCKED 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 28E0F171D2 for ; Mon, 8 Jul 2019 11:02:17 +0100 (BST) Received: from localhost ([::1]:40028 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkQTQ-0006Bu-QZ for patchwork@mira.cbaines.net; Mon, 08 Jul 2019 06:02:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55185) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkQRh-0005ja-5Q 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 1hkQRe-0003Nh-W4 for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:29 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49076) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hkQRe-0003N3-H9 for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:26 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hkQRe-0004xB-Ej for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:26 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH 30/31] gnu: icu4c: 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.156258002218982 (code B ref 36477); Mon, 08 Jul 2019 10:00:26 +0000 Received: (at 36477) by debbugs.gnu.org; 8 Jul 2019 10:00:22 +0000 Received: from localhost ([127.0.0.1]:57886 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkQRX-0004vs-V7 for submit@debbugs.gnu.org; Mon, 08 Jul 2019 06:00:20 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:46061) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkQR9-0004pY-QA for 36477@debbugs.gnu.org; Mon, 08 Jul 2019 05:59:56 -0400 Received: by mail-wr1-f65.google.com with SMTP id f9so16306098wre.12 for <36477@debbugs.gnu.org>; Mon, 08 Jul 2019 02:59:55 -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=1ETTHX8XPRPYspa+IFrFluxA7fGLdzlme6+Tllt/8ho=; b=OSmWZZR4fk7TdwHYsdz7yYblCnjlmn7cIunNOJMZvZ1v9hV5CScFcfvBmplRZkZgfl /7qPvCVn2Y8ned9HZwdFJX7+qNyj1PRa2p7ACxFYAy6I2MXh+h7MqEjztmFCGOE7+oaF pe+ZEeLu5hSkp+rCpcrDJI5OgEccp+cZJnzDNkAHsQ2HGFcHQo/4viwk59MGFAp19q0e s60ssotNLDP16lUzbSclLLTip9LDKMBmufT46DM0X5ezosldlweWEg5wfuFNazXYf4Qr RwSboBwKUZkUgka0J4sEg5wCJxAwnF+5yc4UPAx11oRVk7qAEjQbDXYLpytmxFxrK139 yasw== 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=1ETTHX8XPRPYspa+IFrFluxA7fGLdzlme6+Tllt/8ho=; b=GGSN/T7wZo8Ac04fERfopF/rhJXwpEkdatWhPpemiBjC12S7P6k+Kx3Spm4WtPrWR4 NZ8EyAKiar/JZbe+twKfsvhCslF/vceIz+Zzo9Ujsw4TwLUKqfswvr+RphyX4pf69eq8 8g985+MLcQO+1QGM6ynFIE1gGvp98x8LzoISSJzJWOaaGZPID695wkXgSc+1AR4N6ftj nZptXk91OBv5Js2lp5quN37TIGxvaYxTgYuag4rYLqU3pSBTjBE/SdEr/XnFFmJluR9n c7UWAYKc7pLNQ5cdehiuKHIXhwV/A0maXbgelkHecozfsuKx/O9IaDBqHCRrAYnkbeAd AIMA== X-Gm-Message-State: APjAAAWtfrDP6lR//+g6lmSqnvszAmUmwF9H3iW2+dCf7mGi/TdNmO49 PDzxmr+Ai/xZckzqeoonBuStWcjI X-Google-Smtp-Source: APXvYqy9JCgI8O9iBUnGTGD59WZ5YmTpzd1AtwIAIpL1LeU5tpf2GOQ+QfPAEBeF2QvpbfmSF/94Mg== X-Received: by 2002:adf:f38a:: with SMTP id m10mr2724928wro.268.1562579989722; Mon, 08 Jul 2019 02:59:49 -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.48 (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:12 +0200 Message-Id: <20190708095913.3460-31-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> 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/icu4c.scm (icu4c-build-root): New variable. (icu4c)[native-inputs]: Add it. [arguments]: Pass it as a configure-flag. --- gnu/packages/icu4c.scm | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index 6e93d6aed9..4d90b31c1c 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,6 +26,7 @@ #:use-module (gnu packages perl) #:use-module (guix licenses) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (guix download) #:use-module (guix build-system ant) #:use-module (guix build-system gnu)) @@ -44,11 +46,21 @@ (sha256 (base32 "17fbk0lm2clsxbmjzvyp245ayx0n4chji3ky1f3fbz2ljjv91i05")))) (build-system gnu-build-system) + ;; When cross-compiling, this package needs a source directory of a + ;; native-build of itself. + (native-inputs (if (%current-target-system) + `(("icu4c-build-root" ,icu4c-build-root)) + '())) (inputs `(("perl" ,perl))) (arguments `(#:configure-flags - '("--enable-rpath" + (list + "--enable-rpath" + ,@(if (%current-target-system) + '((string-append "--with-cross-build=" + (assoc-ref %build-inputs "icu4c-build-root"))) + '()) ,@(if (let ((s (or (%current-target-system) (%current-system)))) (or (string-prefix? "arm" s) @@ -81,6 +93,25 @@ C/C++ part.") (license x11) (home-page "http://site.icu-project.org/"))) +(define-public icu4c-build-root + (package + (inherit icu4c) + (name "icu4c-build-root") + (arguments + (substitute-keyword-arguments (package-arguments icu4c) + ((#:tests? _ '()) + #f) + ((#:out-of-source? _ '()) + #t) + ((#:phases phases) + `(modify-phases ,phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (copy-recursively "../build" out) + #t))))))) + (native-inputs '()))) + (define-public java-icu4j (package (name "java-icu4j")