From patchwork Wed Aug 21 08:54:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15066 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 403F517264; Wed, 21 Aug 2019 09:57:58 +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 EAD9B1724B for ; Wed, 21 Aug 2019 09:57:57 +0100 (BST) Received: from localhost ([::1]:45618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MRJ-0000La-3D for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:57:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58831) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPl-0006x6-7K for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPj-0005Oe-RG for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:21 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54104) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPj-0005OY-OI for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:19 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPj-0006bP-Lo for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:19 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 30/61] gnu: icu4c: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56:19 +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.156637776925199 (code B ref 36477); Wed, 21 Aug 2019 08:56:19 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:09 +0000 Received: from localhost ([127.0.0.1]:34662 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPW-0006Y9-Fi for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:06 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:51267) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOy-0006Qy-DX for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:32 -0400 Received: by mail-wm1-f67.google.com with SMTP id k1so1278325wmi.1 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55:32 -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=NFg6rLe41Vu+A3BWHTZt5cAsvwD5MY8+jVW7IoSdJo0=; b=tPCikRY5TQSFqYFFbW1zv5X9Mk2TTgQ7ocvywcGq3pEPpxlEHXSlJYM/YQSJSKvTVM HVtyaqw+2B/iCN25+XhwGSeq/hUNoaGOoiy7exfYNzUCofmO+37V1P99R24wPgg6wsCU 1RsC45bnn7bfkr4Y6agrJT1FTdHGHRIBCa/LiEaUDD6A/BMRFUMS/4Htr0RiqyeIFrrh N4zdNil/FJak1iTPcn7BZAI1b5LQn9v+yW8r7iHdZy7xpHYAkiECKxjizEU181TZiwGX d0vjNES/DmwgXhDWg1LnD2OAy1kE/ivUzGfK5gBlRQf2uSwUCMOptyPAD4Bo/lu+ROWv 3LYg== 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=NFg6rLe41Vu+A3BWHTZt5cAsvwD5MY8+jVW7IoSdJo0=; b=nk0Hn6TQrJmmfgEtAVFbePOkdG3DdUkjZr2qgHSkGWI6nIdYdzMnTjRuiSwF23xcb1 zgNG804eTCqmoYdo7pz7BXCjxwBLbX1XSaGCkMq5HkV+xBeg/UCnnkgQNkhUpADu27uy 9qCgEiRX3L8QqmUOZcNA/EZWnA5OYYobD1wpOaBOFi62zYDhdRZwHQQuzPqwapzUIEGK 10fZ2A4nRP1RLz0/UN57YL4h7yr8OvFzuVoiSaIlXMpjnw6lVsjkSyhkMNHjA493sQnX P7KknQSgODG32JR4Yo00CDl8bmoXoudVbYidvXJXlCzL5zJPFGqWKzvQVFJgrszNc89t 6E+g== X-Gm-Message-State: APjAAAUG8kHvHfeqiwYMF5Ej2TztfkQqHA1HlhkmyU6byF7JX9VHZWa8 2ECCP1EfWYpBL8/jI283BvMNR4sMKUw= X-Google-Smtp-Source: APXvYqxrQkejHh/bjvZWCL/f9V+g00BjfH44I4C7B/50p0/mdKqRLW7FmlEGVb9iQ3odo8hEI6SVUg== X-Received: by 2002:a05:600c:228f:: with SMTP id 15mr4486864wmf.160.1566377726458; Wed, 21 Aug 2019 01:55:26 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:25 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:24 +0200 Message-Id: <20190821085455.18508-30-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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 | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index 922dfbd348..c70871f7e7 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +28,7 @@ #:use-module (gnu packages python) #: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)) @@ -70,13 +72,23 @@ (sha256 (base32 "0v0xsf14xwlj125y9fd8lrhsaych4d8liv8gr746zng6g225szb2")))) (build-system gnu-build-system) + ;; When cross-compiling, this package needs a source directory of a + ;; native-build of itself. (native-inputs - `(("python" ,python-minimal))) + `(("python" ,python-minimal) + ,@(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"))) + '())) #:phases (modify-phases %standard-phases (add-after 'unpack 'chdir-to-source @@ -105,6 +117,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")