From patchwork Tue Oct 29 09:00:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 69617 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 9309F27BBEA; Tue, 29 Oct 2024 09:01:32 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 D3A9827BBE2 for ; Tue, 29 Oct 2024 09:01:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t5i66-0006gY-Am; Tue, 29 Oct 2024 05:01:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t5i62-0006gH-QL for guix-patches@gnu.org; Tue, 29 Oct 2024 05:01:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t5i62-0001SQ-I1 for guix-patches@gnu.org; Tue, 29 Oct 2024 05:01:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=A3Gkg8kHd+4/7dHDMPIF+K41oiNtCvFi+FXgBuMUyqg=; b=YqOHBx8a7CaJiKuNaYV9mddsvK3r77wU92KEtetcN+4Ep17gvepZqGGanDJOVvCTMnvbAMOEuq9Ovw0GK4ipy7k//g/BTHakMAdkEVwErWRC+cgQUi8zvc0WOF5ykzu85+OCfQBV0GmQK0QtajNF480EcmZrTKUqAclN9ZwAqZ3xePSnkLG3pJl4aKJrRXAB6oZiFYLxajlaQ+hotMNwolA2zApw7+BwL4SnX/FkshsIegKGwiVb68DrI8wfJNwPdGSEGjBw43ADDkVHJiSC/2ZvRG1S+v9fxGCXwZwtCWO8mdnC1qcZ1r+bHTw1TX1D4iwbcn7vWFlmvgp3R2uN7w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t5i62-00044B-Bb for guix-patches@gnu.org; Tue, 29 Oct 2024 05:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74081] [PATCH] gnu: ruby-ethon: Fix libcurl detection at runtime. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Oct 2024 09:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74081 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74081@debbugs.gnu.org Cc: Nicolas Graves X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.173019243215579 (code B ref -1); Tue, 29 Oct 2024 09:01:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 Oct 2024 09:00:32 +0000 Received: from localhost ([127.0.0.1]:55910 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5i5X-00043D-Qd for submit@debbugs.gnu.org; Tue, 29 Oct 2024 05:00:32 -0400 Received: from lists.gnu.org ([209.51.188.17]:39350) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5i5V-000435-HT for submit@debbugs.gnu.org; Tue, 29 Oct 2024 05:00:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t5i5U-0006eo-VI for guix-patches@gnu.org; Tue, 29 Oct 2024 05:00:29 -0400 Received: from 16.mo550.mail-out.ovh.net ([178.33.104.224]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t5i5R-0001OR-Vg for guix-patches@gnu.org; Tue, 29 Oct 2024 05:00:28 -0400 Received: from director11.ghost.mail-out.ovh.net (unknown [10.109.148.21]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 4Xd4302kGPz1XZM for ; Tue, 29 Oct 2024 09:00:12 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-mpwhb (unknown [10.108.42.192]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id C1D171FECB; Tue, 29 Oct 2024 09:00:11 +0000 (UTC) Received: from ngraves.fr ([37.59.142.108]) by ghost-submission-5b5ff79f4f-mpwhb with ESMTPSA id dLMqHxukIGcnUgAADW6DCw (envelope-from ); Tue, 29 Oct 2024 09:00:11 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-108S00205b4ba78-dea8-463f-9f7e-fcc8cc70c276, 0CE63A758BBAB584BC146B19CC27A6CF98533BD7) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 86.246.19.221 Date: Tue, 29 Oct 2024 10:00:03 +0100 Message-ID: <20241029090005.15609-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 11825326722587550434 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdektddguddvhecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeekffegteffgfffjeegjedvfffgtddvueeutefgfeeuvdejgedvgeejjeevueeuveenucfkphepuddvjedrtddrtddruddpkeeirddvgeeirdduledrvddvuddpfeejrdehledrudegvddruddtkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepghhuihigqdhprghttghhvghssehgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedtpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=A3Gkg8kHd+4/7dHDMPIF+K41oiNtCvFi+FXgBuMUyqg=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1730192412; v=1; b=SEaVH1Sh9BD1S7mJggxySOq/dYU4bjESXnthn2RUQgKf/PPhfU/L6Q/7eoGTSVRTuYx1NEdO TTyyap1DA28JUdXh2cCJ61q5w3rh4HfQs2d3UL12pbDNk241eI9uqaa3iJ5A87l1g70YYvH4O4Y oK9hWVH8OefhjfMblRyVXLzDAN/IGqsjaEeOx1ahBf1UAovLOCQqml34XvdAJWsY80cNulKHnz8 KrTvhWSfiQZAssgVvj/Fsv5NBXVr/Fqkdmgz/xQe5UJaqI5zVQxSLxUfDX1nyT2hyrHu6EANZxD wSYZiLLVlPPWK4BV/OOzZfwVR80U4lQ5/PHgz/V37FqIg== Received-SPF: pass client-ip=178.33.104.224; envelope-from=ngraves@ngraves.fr; helo=16.mo550.mail-out.ovh.net 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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ruby.scm (ruby-ethon)[arguments]<#:phases>: Add phase 'libcurl-use-absolute-reference. --- gnu/packages/ruby.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 5af1bb1cef..12c439b3a9 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3089,7 +3089,15 @@ (define-public ruby-ethon "0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9")))) (build-system ruby-build-system) (arguments - `(#:tests? #f)) ; no included tests + (list + #:tests? #f ; no included tests + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'libcurl-use-absolute-reference + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "lib/ethon/curls/settings.rb" + (("libcurl', 'libcurl\\.so\\.4") + (search-input-file inputs "/lib/libcurl.so")))))))) (inputs (list curl)) (propagated-inputs