From patchwork Wed Aug 25 18:02:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 32257 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 8BC8A27BBE3; Wed, 25 Aug 2021 19:04:41 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 55CBD27BBE1 for ; Wed, 25 Aug 2021 19:04:41 +0100 (BST) Received: from localhost ([::1]:56952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxGS-0000Uo-EN for patchwork@mira.cbaines.net; Wed, 25 Aug 2021 14:04:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIxFu-0007wX-Nv for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36174) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIxFu-0000qR-D4 for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mIxFu-0002ni-84 for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH 09/52] gnu: poppler: Find pkg-config when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Aug 2021 18:04:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50201 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50201@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50201-submit@debbugs.gnu.org id=B50201.162991463810591 (code B ref 50201); Wed, 25 Aug 2021 18:04:06 +0000 Received: (at 50201) by debbugs.gnu.org; 25 Aug 2021 18:03:58 +0000 Received: from localhost ([127.0.0.1]:47681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFm-0002kf-9X for submit@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:58 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:50732) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFW-0002fr-GS for 50201@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:43 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id lu3d2500J0mfAB406u3iTZ; Wed, 25 Aug 2021 20:03:42 +0200 From: Maxime Devos Date: Wed, 25 Aug 2021 20:02:49 +0200 Message-Id: <20210825180332.5720-9-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210825180332.5720-1-maximedevos@telenet.be> References: <20210825180332.5720-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1629914622; bh=LeJBy+ilYlmlNcsj0ZMMdULIwkVqn0ehPUzcDABJqZM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dTkLG2J+23newVs8UaeUQYQf1O3T/KyLI4LocMX8oroKg2JGv5UE3stcdVC35cQa0 7hQL2SlQLCFhTNQS6yDDyeF36Wfl+ECibtsglW/hFkpB19njcQkuE80tfgswty69En 8WdEkcCMVvU+adV+5eEr9aG0sHCLBpcDvlu/0LkmJpOg0pB1gtE92SKs9upK7cxyUF VH5EQkdxOPuvWY09v6wzN71Y2TpInAs9dqtzu8kBynxPxkQP+Q03nRLRSzQUabfSQd 7LSDh3fEeWMtWFGzqt5cL76pbJHinpZQglGIhnkeCQIXopjb0PhoppM7NGClM/XQZR Ju7YWNST9aypA== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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/pdf.scm (poppler)[arguments]<#:phases>{set-PKG_CONFIG}: New phase. --- gnu/packages/pdf.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 8e2cebe490..1a3cb63352 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Timotej Lazar ;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -264,7 +265,14 @@ please install the @code{flyer-composer-gui} package."))) "-DENABLE_ZLIB=ON" "-DENABLE_BOOST=OFF" ;disable Boost to save size (string-append "-DCMAKE_INSTALL_LIBDIR=" lib) - (string-append "-DCMAKE_INSTALL_RPATH=" lib))))) + (string-append "-DCMAKE_INSTALL_RPATH=" lib))) + ,@(if (%current-target-system) + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-PKG_CONFIG + (lambda _ + (setenv "PKG_CONFIG" ,(pkg-config-for-target)))))) + '()))) (synopsis "PDF rendering library") (description "Poppler is a PDF rendering library based on the xpdf-3.0 code base.")