all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Thiago Jung Bauermann via Guix-patches via <guix-patches@gnu.org>
To: 56367@debbugs.gnu.org
Cc: Thiago Jung Bauermann <bauermann@kolabnow.com>
Subject: [bug#56367] [PATCH] gnu: curl: Fix build on powerpc64le-linux
Date: Sun,  3 Jul 2022 08:16:32 -0300	[thread overview]
Message-ID: <20220703111632.98024-1-bauermann@kolabnow.com> (raw)

* gnu/packages/patches/curl-include-sched-h.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/curl.scm (curl)[source]<patches>: New field.
---

Hello,

On powerpc64le-linux, “guix pull” is broken because the curl build fails
with:

--8<---------------cut here---------------start------------->8---
In file included from easy.c:89:
easy_lock.h: In function ‘curl_simple_lock_lock’:
easy_lock.h:56:7: error: implicit declaration of function ‘sched_yield’ [-Werror=implicit-function-declaration]
   56 |       sched_yield();
      |       ^~~~~~~~~~~
--8<---------------cut here---------------end--------------->8---

So backport the upstream commit that fixed it.

 gnu/local.mk                                  |  1 +
 gnu/packages/curl.scm                         |  3 +-
 .../patches/curl-include-sched-h.patch        | 29 +++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/curl-include-sched-h.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 3a56ad371dd0..98704d8f2a89 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -977,6 +977,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/crda-optional-gcrypt.patch		\
   %D%/packages/patches/clucene-contribs-lib.patch               \
   %D%/packages/patches/cube-nocheck.patch			\
+  %D%/packages/patches/curl-include-sched-h.patch		\
   %D%/packages/patches/curl-use-ssl-cert-env.patch		\
   %D%/packages/patches/cursynth-wave-rand.patch			\
   %D%/packages/patches/cvs-CVE-2017-12836.patch		\
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index ebc36eead2a5..20c2159299d3 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -153,7 +153,8 @@ (define curl-7.84.0
                                   version ".tar.xz"))
               (sha256
                (base32
-                "1f2xgj0wvys9xw50h7vcbaraavjr9rxx9n06x2xfbgs7ym1qn49d"))))
+                "1f2xgj0wvys9xw50h7vcbaraavjr9rxx9n06x2xfbgs7ym1qn49d"))
+              (patches (search-patches "curl-include-sched-h.patch"))))
     (arguments (substitute-keyword-arguments (package-arguments curl)
                  ((#:phases phases)
                   (cond
diff --git a/gnu/packages/patches/curl-include-sched-h.patch b/gnu/packages/patches/curl-include-sched-h.patch
new file mode 100644
index 000000000000..7ea794c016f0
--- /dev/null
+++ b/gnu/packages/patches/curl-include-sched-h.patch
@@ -0,0 +1,29 @@
+From e2e7f54b7bea521fa8373095d0f43261a720cda0 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Mon, 27 Jun 2022 08:46:21 +0200
+Subject: [PATCH] easy_lock.h: include sched.h if available to fix build
+
+Patched-by: Harry Sintonen
+
+Closes #9054
+---
+ lib/easy_lock.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+This patch is taken from curl's master branch to fix a build failure on
+powerpc64le-linux. See https://github.com/curl/curl/issues/9071
+
+diff --git a/lib/easy_lock.h b/lib/easy_lock.h
+index 819f50ce815b..1f54289ceb2d 100644
+--- a/lib/easy_lock.h
++++ b/lib/easy_lock.h
+@@ -36,6 +36,9 @@
+ 
+ #elif defined (HAVE_ATOMIC)
+ #include <stdatomic.h>
++#if defined(HAVE_SCHED_YIELD)
++#include <sched.h>
++#endif
+ 
+ #define curl_simple_lock atomic_bool
+ #define CURL_SIMPLE_LOCK_INIT false

base-commit: cec5a522e190447e64a0a0f193bccc67b7095c31




             reply	other threads:[~2022-07-03 11:17 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-03 11:16 Thiago Jung Bauermann via Guix-patches via [this message]
     [not found] ` <handler.56367.B.165684701922480.ack@debbugs.gnu.org>
2022-07-03 11:31   ` bug#56367: Acknowledgement ([PATCH] gnu: curl: Fix build on powerpc64le-linux) Thiago Jung Bauermann via Guix-patches via

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=20220703111632.98024-1-bauermann@kolabnow.com \
    --to=guix-patches@gnu.org \
    --cc=56367@debbugs.gnu.org \
    --cc=bauermann@kolabnow.com \
    /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.