From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 0MO8Excx8195IwAA0tVLHw (envelope-from ) for ; Mon, 04 Jan 2021 15:15:35 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id qCq+Dxcx818qcAAAB5/wlQ (envelope-from ) for ; Mon, 04 Jan 2021 15:15:35 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 0E1E3940667 for ; Mon, 4 Jan 2021 15:15:35 +0000 (UTC) Received: from localhost ([::1]:40980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kwRa1-0006md-50 for larch@yhetil.org; Mon, 04 Jan 2021 10:15:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54512) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kwRZX-0006mR-02 for guix-patches@gnu.org; Mon, 04 Jan 2021 10:15:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48428) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kwRZW-0006cN-P5 for guix-patches@gnu.org; Mon, 04 Jan 2021 10:15:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kwRZW-0000h9-KM for guix-patches@gnu.org; Mon, 04 Jan 2021 10:15:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45653] [PATCH 1/2] gnu: guile-curl: Update to 0.7. References: <112cba58b6931b336fce201041fc6e21954de261.camel@student.tugraz.at> In-Reply-To: <112cba58b6931b336fce201041fc6e21954de261.camel@student.tugraz.at> Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Jan 2021 15:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45653 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45653@debbugs.gnu.org Received: via spool by 45653-submit@debbugs.gnu.org id=B45653.16097732432551 (code B ref 45653); Mon, 04 Jan 2021 15:15:02 +0000 Received: (at 45653) by debbugs.gnu.org; 4 Jan 2021 15:14:03 +0000 Received: from localhost ([127.0.0.1]:59965 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kwRYZ-0000f0-5A for submit@debbugs.gnu.org; Mon, 04 Jan 2021 10:14:03 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:20717) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kwRYW-0000eL-WD for 45653@debbugs.gnu.org; Mon, 04 Jan 2021 10:14:01 -0500 Received: from localhost.localdomain (217-149-174-13.nat.highway.telekom.at [217.149.174.13]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4D8fKd6zMYz3wYh for <45653@debbugs.gnu.org>; Mon, 4 Jan 2021 16:13:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1609773238; bh=nvmUVTEFr8srj1DtYtY3zRqPmKfwXZoB51ANAGMwwF8=; h=From:To:Subject:Date; b=l93W18N4sST5qmXjo5+ik2Q0HtpM9mFb/la/40KAE/sSVjxtV2PH1eA+y970iS3xZ T0VpmDMj1BQ/Xodnv/xMAXEVhN8hufQk28U2j03kFTPDAImAKCZTeUcaoZHOJiPsmj u4CLCgYkQR0H0Ir5YmFheIpp8J3YaCl+BB7R5uto= From: Leo Prikler Date: Mon, 4 Jan 2021 16:13:50 +0100 Message-Id: <20210104151351.18675-1-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 3.77 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=tugraz.at header.s=mailrelay header.b=l93W18N4; dmarc=fail reason="SPF not aligned (relaxed)" header.from=student.tugraz.at (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 0E1E3940667 X-Spam-Score: 3.77 X-Migadu-Scanner: scn0.migadu.com X-TUID: QiU3f9fNAckc * gnu/packages/curl.scm (guile-curl): Update to 0.7. [#:modules, #:imported-modules]: Load guile-build-system for target-guile-effective-version. [#:configure-flags]: Use target-guile-effective-version. [#:phases]: Add 'patch-undefined-references. Use target-guile-effective-version. [inputs]: Use guile-3.0. --- gnu/packages/curl.scm | 59 ++++++++++++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 17 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 33a2188d70..451c517ee1 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -243,43 +243,68 @@ not offer a replacement for libcurl.") (define-public guile-curl (package (name "guile-curl") - (version "0.6") + (version "0.7") (source (origin (method url-fetch) (uri (string-append "http://www.lonelycactus.com/tarball/" "guile_curl-" version ".tar.gz")) (sha256 (base32 - "1pxdhnk288ky6gkpad8i60m0p6404rdvls43lr1b5d3csrklyc70")))) + "1zk0ijx6bj212k0j0ma84cpvpvn0x6raaxnby3wdx3w4wnhnscn7")))) (build-system gnu-build-system) (arguments - `(#:configure-flags (list (string-append + `(#:modules (((guix build guile-build-system) + #:select (target-guile-effective-version)) + ,@%gnu-build-system-modules) + #:imported-modules ((guix build guile-build-system) + ,@%gnu-build-system-modules) + #:configure-flags (list (string-append "--with-guilesitedir=" (assoc-ref %outputs "out") - "/share/guile/site/2.2") + "/share/guile/site/" + (target-guile-effective-version + (assoc-ref %build-inputs "guile"))) (string-append "-with-guileextensiondir=" (assoc-ref %outputs "out") - "/lib/guile/2.2/extensions")) + "/lib/guile/" + (target-guile-effective-version + (assoc-ref %build-inputs "guile")) + "/extensions")) #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-undefined-references + (lambda* _ + (substitute* "src/curl.scm" + ;; The following #defines are missing from our curl package + ;; and therefore result in the evaluation of undefined symbols. + ((",CURLOPT_HAPROXYPROTOCOL") "#f") + ((",CURLOPT_DISALLOW_USERNAME_IN_URL") "#f") + ((",CURLOPT_TIMEVALUE_LARGE") "#f") + ((",CURLOPT_DNS_SHUFFLE_ADDRESSES") "#f") + ((",CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS") "#f")))) (add-after 'install 'patch-extension-path (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (curl.scm (string-append - out "/share/guile/site/2.2/curl.scm")) - (curl.go (string-append - out "/lib/guile/2.2/site-ccache/curl.go")) - (ext (string-append out "/lib/guile/2.2/" - "extensions/libguile-curl"))) - (substitute* curl.scm (("libguile-curl") ext)) - ;; The build system does not actually compile the Scheme module. - ;; So we can compile it and put it in the right place in one go. - (invoke "guild" "compile" curl.scm "-o" curl.go))))))) + (let* ((out (assoc-ref outputs "out")) + (curl.scm (string-append + out "/share/guile/site/" + (target-guile-effective-version) + "/curl.scm")) + (curl.go (string-append + out "/lib/guile/" + (target-guile-effective-version) + "/site-ccache/curl.go")) + (ext (string-append out "/lib/guile/" + (target-guile-effective-version) + "/extensions/libguile-curl"))) + (substitute* curl.scm (("libguile-curl") ext)) + ;; The build system does not actually compile the Scheme module. + ;; So we can compile it and put it in the right place in one go. + (invoke "guild" "compile" curl.scm "-o" curl.go))))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("curl" ,curl) - ("guile" ,guile-2.2))) + ("guile" ,guile-3.0))) (home-page "http://www.lonelycactus.com/guile-curl.html") (synopsis "Curl bindings for Guile") (description "@code{guile-curl} is a project that has procedures that allow -- 2.30.0