From patchwork Sun Jul 3 11:16:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thiago Jung Bauermann X-Patchwork-Id: 40486 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 E9B8F27BBEA; Sun, 3 Jul 2022 12:17:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 6F4BA27BBE9 for ; Sun, 3 Jul 2022 12:17:25 +0100 (BST) Received: from localhost ([::1]:60372 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o7xbQ-0001eM-Kk for patchwork@mira.cbaines.net; Sun, 03 Jul 2022 07:17:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51740) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o7xb4-0001cs-7m for guix-patches@gnu.org; Sun, 03 Jul 2022 07:17:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49526) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o7xb3-0007Zd-VU for guix-patches@gnu.org; Sun, 03 Jul 2022 07:17:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o7xb3-0005qs-Rp for guix-patches@gnu.org; Sun, 03 Jul 2022 07:17:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56367] [PATCH] gnu: curl: Fix build on powerpc64le-linux Resent-From: Thiago Jung Bauermann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 03 Jul 2022 11:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 56367 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56367@debbugs.gnu.org Cc: Thiago Jung Bauermann X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.165684701922480 (code B ref -1); Sun, 03 Jul 2022 11:17:01 +0000 Received: (at submit) by debbugs.gnu.org; 3 Jul 2022 11:16:59 +0000 Received: from localhost ([127.0.0.1]:43423 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o7xb0-0005qW-RU for submit@debbugs.gnu.org; Sun, 03 Jul 2022 07:16:59 -0400 Received: from lists.gnu.org ([209.51.188.17]:58134) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o7xaw-0005qL-KH for submit@debbugs.gnu.org; Sun, 03 Jul 2022 07:16:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51702) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o7xaw-0001cL-89 for guix-patches@gnu.org; Sun, 03 Jul 2022 07:16:54 -0400 Received: from mx.kolabnow.com ([212.103.80.154]:57088) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o7xas-0007Y7-Tq for guix-patches@gnu.org; Sun, 03 Jul 2022 07:16:52 -0400 Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id EEDC0145E for ; Sun, 3 Jul 2022 13:16:45 +0200 (CEST) Authentication-Results: ext-mx-out002.mykolab.com (amavisd-new); dkim=pass (4096-bit key) reason="pass (just generated, assumed good)" header.d=kolabnow.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-transfer-encoding:content-type:content-type:mime-version :message-id:date:date:subject:subject:from:from:received :received:received; s=dkim20160331; t=1656847005; x=1658661406; bh=QMNyFAb1AF7XmTLjFTla/ScKvbTLcImXYNAqx8E1f3s=; b=0c+x67WDoZf1 vDYqFa9w7MDFRf6/qwa6zJ3KFkXkxUAL3DisV26ZrO4Z7ZDSbrL0+Bn5NeKhfqxY BabZ0pm6r0WVQowNlKSaRSkiKoq99xV5JeI8WLBCFgzi1OoABCoE9/Cx8Q882Zx/ Qng8skLd7jX+lQ5kN0Qd162OTlRTEGzT3JxBLHkRDbU7G1DdHDsLH2kKadcRd2Na PE6M7VB8Uwej3lp/Sn0WvsrfQVvcT5Lnmu9As3gBQsLl2XMiJKE0lh+whJDne8/h wOAwpiu4nAdd5t2dIgkvwpnsrw08VTZa9XF2sZwSN7+I2201CiSwXN8H5lYb9/gc OioUyM7YJ7v4ewTlLvTH4XMMIiTHTRPOxqmV9+C28SFokDLc2+2Lb+jgGY9+zIgb hSANc7hNy9h4uUtwk0+8rgAwlhcVX1qTWm72+JQzWJv2YAhGD7gNiDGJzXmIyNAe mMvotuZ4PFUmLqIBnjla1oi7uGwhUPY6H4CTDgZZJRarQYZMj9uIT8AMUQ//6IJa v/W9w0d2tAJ8yRrcjYYqROywcM5fzlP1Jy0OwlES1vRgBPvkpw0BATJvLuBYcMcW v7xIWF7bvkgWBM+c1g0m0rtC57rjUmSAY3YhLsjaYKwR/XtknRC5xd8aDHtl7DID pcUxsb6xfAmF2eCK5kNjvuE5agOdajg= X-Virus-Scanned: amavisd-new at mykolab.com Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out002.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yYm02C8T1hR2 for ; Sun, 3 Jul 2022 13:16:45 +0200 (CEST) Received: from int-mx003.mykolab.com (unknown [10.9.13.3]) by mx.kolabnow.com (Postfix) with ESMTPS id 5DAC3B53 for ; Sun, 3 Jul 2022 13:16:44 +0200 (CEST) Received: from ext-subm001.mykolab.com (unknown [10.9.6.1]) by int-mx003.mykolab.com (Postfix) with ESMTPS id 991AF4592; Sun, 3 Jul 2022 13:16:43 +0200 (CEST) Date: Sun, 3 Jul 2022 08:16:32 -0300 Message-Id: <20220703111632.98024-1-bauermann@kolabnow.com> MIME-Version: 1.0 Received-SPF: pass client-ip=212.103.80.154; envelope-from=bauermann@kolabnow.com; helo=mx.kolabnow.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Thiago Jung Bauermann X-ACL-Warn: , Thiago Jung Bauermann via Guix-patches X-Patchwork-Original-From: Thiago Jung Bauermann via Guix-patches via From: Thiago Jung Bauermann X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/curl-include-sched-h.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/curl.scm (curl)[source]: 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 base-commit: cec5a522e190447e64a0a0f193bccc67b7095c31 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 +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 ++#if defined(HAVE_SCHED_YIELD) ++#include ++#endif + + #define curl_simple_lock atomic_bool + #define CURL_SIMPLE_LOCK_INIT false