From patchwork Thu Jan 20 15:08:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dale Mellor X-Patchwork-Id: 36655 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 0E63427BBEA; Thu, 20 Jan 2022 20:08:46 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C9E9B27BBE9 for ; Thu, 20 Jan 2022 20:08:45 +0000 (GMT) Received: from localhost ([::1]:54306 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAdjh-0003Xx-02 for patchwork@mira.cbaines.net; Thu, 20 Jan 2022 15:08:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50240) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAZ3w-0002lz-67 for guix-patches@gnu.org; Thu, 20 Jan 2022 10:09:20 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37836) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nAZ3e-0004kD-Qd for guix-patches@gnu.org; Thu, 20 Jan 2022 10:09:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nAZ3e-000331-G0 for guix-patches@gnu.org; Thu, 20 Jan 2022 10:09:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53392] [PATCH] gnu: curl: patch curlpp.pc.in before configure. Resent-From: Dale Mellor Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 20 Jan 2022 15:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53392 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53392@debbugs.gnu.org X-Debbugs-Original-To: guix-patches Received: via spool by submit@debbugs.gnu.org id=B.164269133811703 (code B ref -1); Thu, 20 Jan 2022 15:09:02 +0000 Received: (at submit) by debbugs.gnu.org; 20 Jan 2022 15:08:58 +0000 Received: from localhost ([127.0.0.1]:58972 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nAZ3a-00032h-2v for submit@debbugs.gnu.org; Thu, 20 Jan 2022 10:08:58 -0500 Received: from lists.gnu.org ([209.51.188.17]:45734) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nAZ3Z-00032Y-5R for submit@debbugs.gnu.org; Thu, 20 Jan 2022 10:08:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50176) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAZ3W-0002i5-6s for guix-patches@gnu.org; Thu, 20 Jan 2022 10:08:55 -0500 Received: from rdmp.org ([52.19.174.175]:33114) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAZ3T-0004B1-BC for guix-patches@gnu.org; Thu, 20 Jan 2022 10:08:53 -0500 Received: from [127.0.0.1] (helo=[IPv6:::1]) by rdmp.org with esmtp (Exim 4.94) (envelope-from ) id 1nAZ3P-0006DW-Jl for guix-patches@gnu.org; Thu, 20 Jan 2022 15:08:47 +0000 Message-ID: <7223e4b8a73de2ba01fc7a47eb3252587fe91d29.camel@rdmp.org> From: Dale Mellor Date: Thu, 20 Jan 2022 15:08:47 +0000 Organization: DM Bespoke Computer Solutions Ltd User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 Received-SPF: softfail client-ip=52.19.174.175; envelope-from=guix-devel-0brg6b@rdmp.org; helo=rdmp.org X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_SOFTFAIL=0.732, SPF_SOFTFAIL=0.665 autolearn=no autolearn_force=no X-Spam_action: no action 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: , Reply-To: guix-devel-0brg6b@rdmp.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From 89221aa43acbb32bb8af62e6a3b485e551059af8 Mon Sep 17 00:00:00 2001 From: Dale Mellor Date: Thu, 20 Jan 2022 14:46:54 +0000 Subject: [PATCH] gnu: curl: patch curlpp.pc.in before configure. The current curlpp.pc pkg-config file that gets installed stipulates that compilers take -Iinclude to link against the curlpp library, but this is insufficient to locate the headers. A patch has been pushed upstream, but there has been no response in over a week so we are 'kludging' the issue here until it is fixed properly. * gnu/packages/curl.scm (curlpp): add pre-configure build step "patch-pkg-config", and put pkg-config itself into propagated-inputs. --- gnu/packages/curl.scm | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 9a9d788ceb..e1b0344be5 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -292,10 +292,32 @@ (define-public curlpp (build-system cmake-build-system) ;; There are no build tests to be had. (arguments - '(#:tests? #f)) + '(#:phases (modify-phases %standard-phases + (add-before 'configure 'patch-pkg-config + (lambda* (#:key outputs #:allow-other-keys) + (with-output-to-file "extras/curlpp.pc.in" + (lambda () + (display + "\ +prefix=@prefix@ +exec_prefix=${prefix} +includedir=${prefix}/@includedir@ +libdir=${exec_prefix}/@libdir@ + +Name: curlpp +Description: cURLpp is a libcurl C++ wrapper +Version: @VERSION@ +Libs: -L${libdir} -lcurlpp @LDFLAGS@ @LIBS@ +Cflags: -I${includedir} @CURLPP_CXXFLAGS@ +# libcurl is required as non-private because CurlHandle.inl uses curl_easy_setopt. +Requires: libcurl +" + ) + #t))))) + #:tests? #f)) ;; The installed version needs the header files from the C library. (propagated-inputs - (list curl)) + (list pkg-config curl)) (synopsis "C++ wrapper around libcURL") (description "This package provides a free and easy-to-use client-side C++ URL