From patchwork Wed Oct 2 09:58:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15571 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 604551749F; Wed, 2 Oct 2019 11:02:12 +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 190191749D for ; Wed, 2 Oct 2019 11:02:12 +0100 (BST) Received: from localhost ([::1]:53168 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbST-0005As-Iq for patchwork@mira.cbaines.net; Wed, 02 Oct 2019 06:02:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51126) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbQc-0003nh-N0 for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFbQb-00009y-8h for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54922) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFbQb-00009c-3y for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iFbQb-0000aG-1T for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v4 12/23] gnu: doxygen: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Oct 2019 10:00:12 +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 Cc: Mathieu Othacehe Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.15700103871908 (code B ref 36477); Wed, 02 Oct 2019 10:00:12 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Oct 2019 09:59:47 +0000 Received: from localhost ([127.0.0.1]:35468 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQA-0000UY-9v for submit@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:46 -0400 Received: from mail-wr1-f50.google.com ([209.85.221.50]:34099) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQ3-0000Su-TN for 36477@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:40 -0400 Received: by mail-wr1-f50.google.com with SMTP id a11so18929754wrx.1 for <36477@debbugs.gnu.org>; Wed, 02 Oct 2019 02:59:39 -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=O7WDndBJ1aLxKx6MpzWhA5cZiJAOjz++YxyVIEdRMec=; b=nY71PqnkV5S81dVvIlYoSfPCkOXG5F7Z7gVqUTe/eApwQbl+65hsb0RUAyACuZAkMX 2PNWOE+L38GGH1gnAvWxRYAPmT/Q2O5Va+zFEVkiYyR+BU9TZG97erkmH9xaZOBSU4Yd ER9gc+xtOa6rjSoU+CmkXshmyD3ZPcONQKWLLqSk552lURjiWW3eamKg+Jyw1LvSQ7rz xumpdgmIDy92KZzS3/rNRM8Nf1ha+gf0De4BYXGHwIsIR9SsfZck2782UFAI5bM9Easd fpJICWNMydDM4j4rs9Xf3hL8LxAN3U0v9KUElwRII/9EdBDdpkNqN8nim3MCtFE8pHdr QEzw== 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=O7WDndBJ1aLxKx6MpzWhA5cZiJAOjz++YxyVIEdRMec=; b=V6AIbD6xuCij/YxfAQIPfM3WPRw1S45aBEOAhWxzDu1upeq6yZmQhWq5N4XMLDbG10 2Tu5X1wyMoKc45h94u2B3Q45TY9k2ahPrfPL0YFFn7vLCE1sHoMVknUoY6KLMnvfuHRF 5yM5/6OjnldjRz5Wby3ftI4/9SnUCFNDLSBzQiyr01qSJvQtscu+RLu+knnzmKHbcAiP jth9UP8g8HLtQD+ND5x7EAsyrkY7bjrN6+mfQy6TE7gpu1gyxmVcCEka/wAOi/tvNIbb NVOo0bsEb/SaHwiC0xwC+/47xDwZR4vQCKScI6vrhJfNowolHbAkR6embrdlIr+LN3hv 0hHg== X-Gm-Message-State: APjAAAU7N1Zn+ac+Rx1ztwRqqR1JQKUXLVa0gEOuIx9kqTC8PBUAYikB KtD5a59nl5cMmOgPHnHTAdlOkS9C X-Google-Smtp-Source: APXvYqwojMdDB8mrOeeBv6HIN2t7imkJiSuZZdthLRWP/aESjDQzRq92G5PEkUJQ9F0aJFb85Kyrvg== X-Received: by 2002:adf:f190:: with SMTP id h16mr1332191wro.357.1570010373819; Wed, 02 Oct 2019 02:59:33 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:fa:a50:21e:67ff:fe5b:4283]) by smtp.gmail.com with ESMTPSA id w12sm29621318wrg.47.2019.10.02.02.59.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Oct 2019 02:59:32 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 2 Oct 2019 11:58:53 +0200 Message-Id: <20191002095904.6325-13-m.othacehe@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191002095904.6325-1-m.othacehe@gmail.com> References: <20191002095904.6325-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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/documentation.scm (doxygen)[arguments]: Force cmake to use iconv.h from cross-libc. --- gnu/packages/documentation.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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 ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; 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)