all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Dale Mellor <guix-devel-0brg6b@rdmp.org>
To: 53392@debbugs.gnu.org
Subject: [bug#53392] [PATCH] gnu: curl: patch curlpp.pc.in before configure.
Date: Thu, 20 Jan 2022 15:08:47 +0000	[thread overview]
Message-ID: <7223e4b8a73de2ba01fc7a47eb3252587fe91d29.camel@rdmp.org> (raw)

From 89221aa43acbb32bb8af62e6a3b485e551059af8 Mon Sep 17 00:00:00 2001
From: Dale Mellor <guix-devel-0brg6b@rdmp.org>
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
-- 
2.34.0







             reply	other threads:[~2022-01-20 20:08 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-20 15:08 Dale Mellor [this message]
2023-10-20 13:19 ` [bug#53392] Is there a reason this issue is not getting addressed? Dale Mellor

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7223e4b8a73de2ba01fc7a47eb3252587fe91d29.camel@rdmp.org \
    --to=guix-devel-0brg6b@rdmp.org \
    --cc=53392@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.