From patchwork Mon Sep 2 15:33:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15258 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 5C0CD1734D; Mon, 2 Sep 2019 16:38:33 +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 1A65217329 for ; Mon, 2 Sep 2019 16:38:33 +0100 (BST) Received: from localhost ([::1]:37672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oPY-0005hT-Ap for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:38:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42605) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMG-0002EE-7C for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oME-0004Ke-Pu for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50030) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oME-0004KQ-Mr for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oME-0006dB-JO for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 25/48] gnu: doxygen: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:06 +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.156743847125145 (code B ref 36477); Mon, 02 Sep 2019 15:35:06 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:31 +0000 Received: from localhost ([127.0.0.1]:58781 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLf-0006XP-85 for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:31 -0400 Received: from mail-wr1-f53.google.com ([209.85.221.53]:42695) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLO-0006Sc-6B for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:15 -0400 Received: by mail-wr1-f53.google.com with SMTP id b16so14430106wrq.9 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:14 -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=czHKW4TdSXROEWA29LMwHzb1inQWIOdBRxWArsNGNuY=; b=ABxDA0+7VCZQYExcsy5Am8fLV/ol1tYwMOPiMBGfBoQO3gtRDBW3v3Ga4P4mPdhx09 MRmBlt/DgQDfz1e2HaJ1jTxkHAVgKbX4BJyCLMHZ9AKuvGc4ozBY37SRIy5ZJdtvLkEw AbTVla8y6xVAHwM4Tgy6jSDDwHeGwBw+AXJa8xDwTSo9RgN4mOI98TToTW1m/CQKGNe2 5tcQrN8lOrRDYBywgBKCMw6JrV/G2ZHsQLFGHq3zhiTwIgMIaALmURD3hAX9RcQLISNg w1LbXzU0/tAk3zkmUHWb/Ao8RlLUKUbH4S9KeAmbLRp2pedtkiR6+2Uw2a0p36ouRI9a CsJA== 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=czHKW4TdSXROEWA29LMwHzb1inQWIOdBRxWArsNGNuY=; b=t0gmZDnSgBvHiuDHiDaYXJQ3l6169Rm03wltU5W2mJbSP7XIUsaOp3GL7j5aMX0Un8 9frfjlDI0cZXZeRs4TzwbesA7RGjMl+6bqoHPXbEoN0WKCiSzWPDQHzq4CehJkSaTUaH F77QLbNnsy8a6hyF2gfWiniaN29UpHWKyKpVBEPLl/DzIe8J2z2JVtjLRJ+pKEWqpkX+ dvv9J7awfmJuw0BUtGYBtoG7S2OSQJxNdiUV5kg0fpLEyoIlJsWALau9mGrB6g3uypP3 NConL0t9XQKP70Xwrc/fcZslwjwNbCpPiKLW4bZhM06Bl7BfLh73SBcXJRSKFIWsccMb wfgQ== X-Gm-Message-State: APjAAAWPvOdpN2KMNI+hAebucj0neGtlYtWG4+3DuH9hOfJBExkL9lHI oAtVAV2/DTGISymOsjO7GNHr+DHw X-Google-Smtp-Source: APXvYqyVyroqnCZ3BBeUL0p2FloMbHHgM4T2TmCQ1QOqGfFKbKEVH2hpksNh2/UEbTz9xCw3jHgrSA== X-Received: by 2002:a5d:46c4:: with SMTP id g4mr20154301wrs.189.1567438448470; Mon, 02 Sep 2019 08:34:08 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:07 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:10 +0200 Message-Id: <20190902153333.11190-26-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/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)