Message ID | 20190821085455.18508-41-m.othacehe@gmail.com |
---|---|
State | New |
Headers | show
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1449417264; Wed, 21 Aug 2019 09:59:31 +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 C720F1724B for <patchwork@mira.cbaines.net>; Wed, 21 Aug 2019 09:59:30 +0100 (BST) Received: from localhost ([::1]:45672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org>) id 1i0MSn-0002PP-VH for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:59:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59130) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1i0MQT-0008CT-MD for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1i0MQS-0005pE-GI for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54170) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1i0MQS-0005p8-DK for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1i0MQS-0006gt-BB for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 41/61] gnu: doxygen: Fix cross-compilation. Resent-From: Mathieu Othacehe <m.othacehe@gmail.com> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:57:04 +0000 Resent-Message-ID: <handler.36477.B36477.156637778525489@debbugs.gnu.org> 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.156637778525489 (code B ref 36477); Wed, 21 Aug 2019 08:57:04 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:25 +0000 Received: from localhost ([127.0.0.1]:34712 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1i0MPo-0006cw-S0 for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:25 -0400 Received: from mail-wm1-f42.google.com ([209.85.128.42]:37057) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <m.othacehe@gmail.com>) id 1i0MP8-0006Sl-Dq for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:42 -0400 Received: by mail-wm1-f42.google.com with SMTP id d16so1286834wme.2 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55:42 -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=9iQhpcdQYGwq2O4Prcoz853TESRn0Vl4Y11/X8xOTrA=; b=drocBzUIBgsrDQXMkIdwcEqqz1bRV3x7upr7mXnXoguqGce3sjukkQ9tcoz+G9WDLs FfExznOhhbMAsbvSqoAlPOwJpFhuhnmb2hB68nVtm/z8XKm1AAZvTOUTB0KTlENyj7HA K9RHVTGh72mj1s72zgLRroYkvmicMo+/yCHbQZIivgCm99hZdu5w30nO5ww5AjZGElkD 3S62GuqznP6ynIG5ICyvP1eLrpFFcoWSYBq52jlWryn756m+zZVoRFO8JRsl8dwkj4H6 IvMD2iScpyCl4g44zbdYehp7jRCpFlC6TU+gd/wKPq3THJQ+f/y4PYQArNn8jxgLFj5F FEJw== 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=9iQhpcdQYGwq2O4Prcoz853TESRn0Vl4Y11/X8xOTrA=; b=bjSeISpu4405i04phanHjkYWVxlgEpr5UEk0+9wDTHIrpPj0E7HnYBMuOVknpErYc5 En0xRvUQj7c4OD/Tykqn179Wra+PDuDn4FwM7IA/xj/WZnGmUeQ7YX2CIpdWRGEeq1GF kuMDnxhYueaLgl+2deR3AnLwAmrsjb6Aqw1ks1W9KGKu0OmP2zoX9vwUU8J3dqKhBaGd 4deRWdKDS9S4bOmuSrcS2Ktu8SA04rXl6f39U27M+6Ynej3S4YoWAS6rPdUahGdQTOoD X15Nm2OetXUbjVauooIB0tc7qtVi0wer0nIoqlWZ3PHuQnFcIQfS5kjouaKW6VL7eQMp Fohw== X-Gm-Message-State: APjAAAVbN+BhImKtQxZ4IFviIH5nXSbBwZgh9xSRVoZUbm3+HntdwAub fbF9y1tb6odSQ2yvejyGT+J6hyMeI50= X-Google-Smtp-Source: APXvYqxfqXdIn5BVk/sMwGPMmZFY0yVHd6OC3eQy34qO7POhl9RZtTs1HLLY5436UAMjL8Z0noM0CA== X-Received: by 2002:a1c:1d4f:: with SMTP id d76mr4990502wmd.127.1566377736477; Wed, 21 Aug 2019 01:55:36 -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.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:35 -0700 (PDT) From: Mathieu Othacehe <m.othacehe@gmail.com> Date: Wed, 21 Aug 2019 10:54:35 +0200 Message-Id: <20190821085455.18508-41-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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=subscribe> Cc: Mathieu Othacehe <m.othacehe@gmail.com> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-getmail-retrieved-from-mailbox: Patches |
Series |
|
Related |
show
|
diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 19c42b00eb..eda8ca3368 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +32,7 @@ #:use-module (guix build-system cmake) #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages python) #:use-module (gnu packages bison) @@ -145,7 +147,15 @@ markup) can be customized and extended by the user.") (inputs `(("bash" ,bash-minimal))) (arguments - `(#:test-target "tests" + ;; Force cmake to use iconv header from cross-libc instead of the one + ;; from native libc. + `(,@(if (%current-target-system) + '(#:configure-flags + (list (string-append "-DICONV_INCLUDE_DIR=" + (assoc-ref %build-inputs "cross-libc") + "/include"))) + '()) + #:test-target "tests" #:phases (modify-phases %standard-phases (add-before 'configure 'patch-sh (lambda* (#:key inputs #:allow-other-keys)