From patchwork Mon May 22 03:48:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Z572 <873216071@qq.com> X-Patchwork-Id: 50216 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 11CFF27BBE2; Mon, 22 May 2023 04:49:21 +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.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,FREEMAIL_REPLYTO_END_DIGIT, MAILING_LIST_MULTI,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 E664327BBE9 for ; Mon, 22 May 2023 04:49:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q0wXf-0004Sv-SF; Sun, 21 May 2023 23:49:03 -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 1q0wXe-0004Sb-SW for guix-patches@gnu.org; Sun, 21 May 2023 23:49:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q0wXe-0001gj-KV for guix-patches@gnu.org; Sun, 21 May 2023 23:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q0wXe-0000bQ-BK for guix-patches@gnu.org; Sun, 21 May 2023 23:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63636] [PATCH 1/2] gnu: pcre2: Update to 10.42. Resent-From: Z572 <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 May 2023 03:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63636 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63636@debbugs.gnu.org Received: via spool by 63636-submit@debbugs.gnu.org id=B63636.16847273182262 (code B ref 63636); Mon, 22 May 2023 03:49:02 +0000 Received: (at 63636) by debbugs.gnu.org; 22 May 2023 03:48:38 +0000 Received: from localhost ([127.0.0.1]:33115 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q0wXF-0000aO-Q0 for submit@debbugs.gnu.org; Sun, 21 May 2023 23:48:38 -0400 Received: from out203-205-221-202.mail.qq.com ([203.205.221.202]:60377) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1q0wXC-0000Za-4o for 63636@debbugs.gnu.org; Sun, 21 May 2023 23:48:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1684727307; bh=vNKROeBUo/8KrtbMdDsoy4g0xOFf0HEAIO9vw5fA9qA=; h=From:To:Subject:Date:In-Reply-To:References; b=vtexEUTnFZu1NNNlBQknY2RTIkPD0zoYTq1TBhHNtOBHGERW23nzZUTKSUyVfJRqC /G224lNG75p0fW7I1rgstGxNoc/iI+EUuJaPMCYwu/xejd8pVqQw28nTHvT84Jzuo6 pi+F6u0ivld5i1vF8xD2la140uKh96Rm40m3XEPw= Received: from localhost.localdomain ([112.10.199.166]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id C070344D; Mon, 22 May 2023 11:48:07 +0800 X-QQ-mid: xmsmtpt1684727287tgrm4d40l Message-ID: X-QQ-XMAILINFO: NMGzQWUSIfvTAlZV2LMkA0NIRLmneEOfXSGWeXBvUOMBZuPl6nVYnjNQ/r7GzU CEJL54bhvhtP2iIE3XZMJI5uxWwtWBV/yhMwNISqaf66rUfWlYu/hZYHR4EkfbIkQ12FN0i0mVlB 0s+smcl6Rbv0CgjmwHrvnN2VBK/rR7NKjA9LVq+zAC/xltPfFsDJKseVCPKFZJer5DbtxMH3kfFC BBhIg5kJU88lZez6LvzvrlSUWFHImvZLXsuLRQNbuVtMkF+3vzXjnDuJgDyTebwZ188LsdtX3Kgj pWlslG1sXaSxalIDDz4+ZcYs0v15DJZUm0Z6N1UBJgtENMp6SyDq+7eRYT1M2I3ZLCfChN3bXWHN LeMxsqR3pDdqFTouRd2dvpGINapuv+9AfAfQYiHgmRbjDmKGP+j7ambPxzWR1u2sCXSSbSzgIzVE 739Rs3/igLcYA8M/uc9ntRvUtinDGzu9burCwR2Ca+9OKaNeQPcQ/9u/VT1Z5Gohlu2e3AATL32K o+2shtUMi/Huh5BZYcMOkk2rNDpXngtFtR7YPvYoy4xFiJ7HcqNzLMc4f0+pbYDFMOo9mOgfOmN8 LvAtNLz+PAY2T3dZvkxENgCsSrrNf+HJHiPBKRl2/ePP0wT4Mlaz9Xt9Zcz6IRsbr9PwFp4gTzWL WzQyDop0UuDpgy+bNBygjd4i0MZD3go3MddT9sG5mYc5lw2SsFpjl/NlCxw9kN0EPnIQ//CxpoYm M1wAhWeVd5FE+AeWObDQ4h64NOqJcBzx/JVg862sB2GnKAQ/+9LK/BmuBOuTL2XgZUP5L5eb+FN4 VGKxJF0ALgsmDYxCkG2axiYM9YCT3dwgo0Cxz2GdVNUCAgLi5d4N/UXEg8rrRMTAWQdyh04kIs1U OHGH5pMnKCQST/rc8gUyHHri9CWkZrjIzPKlfwZmmqVBWBn/+nWClKcQO3RNI8fBRM/EL45ywkTU yUlIs6Kwulo+T3kgqclw== Date: Mon, 22 May 2023 11:48:05 +0800 X-OQ-MSGID: <0d309ebcd37a93cba1c1d4b3851d7a7203a0a8ac.1684726234.git.873216071@qq.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 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: Z572 <873216071@qq.com> X-ACL-Warn: , Z572 via Guix-patches X-Patchwork-Original-From: Z572 via Guix-patches via From: Z572 <873216071@qq.com> 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/pcre.scm (pcre2): Update to 10.42. [arguments]: <#:configure-flags>: enable jit when target to riscv64. --- gnu/packages/pcre.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index 7c53a27685..769738c3d5 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2021 Jean-Baptiste Volatier ;;; Copyright © 2021 Simon Tournier +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -93,7 +94,7 @@ (define-public pcre (define-public pcre2 (package (name "pcre2") - (version "10.40") + (version "10.42") (source (origin (method url-fetch) (uri (string-append "https://github.com/PCRE2Project/pcre2" @@ -101,7 +102,7 @@ (define-public pcre2 "/pcre2-" version ".tar.bz2")) (sha256 (base32 - "0s4x2l6g0sb9piwkr3sxqwdswz2g6bk1hhwngv0kv4w38wybir0l")))) + "0h78np8h3dxlmvqvpnj558x67267n08n9zsqncmlqapans6csdld")))) (build-system gnu-build-system) (inputs (list bzip2 readline zlib)) (arguments @@ -113,8 +114,7 @@ (define-public pcre2 "--enable-pcre2-16" "--enable-pcre2-32" ;; pcre2_jit_test fails on powerpc32. - ;; riscv64-linux is an unsupported architecture. - #$@(if (or (target-ppc32?) (target-riscv64?)) + #$@(if (target-ppc32?) #~() #~("--enable-jit")) "--disable-static") From patchwork Mon May 22 03:48:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Z572 <873216071@qq.com> X-Patchwork-Id: 50215 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 3DA9527BBEA; Mon, 22 May 2023 04:49:19 +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.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,FREEMAIL_REPLYTO_END_DIGIT, MAILING_LIST_MULTI,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 7C23B27BBE2 for ; Mon, 22 May 2023 04:49:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q0wXg-0004TB-G8; Sun, 21 May 2023 23:49:04 -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 1q0wXf-0004Si-4T for guix-patches@gnu.org; Sun, 21 May 2023 23:49:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q0wXe-0001gw-Sx for guix-patches@gnu.org; Sun, 21 May 2023 23:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q0wXe-0000bX-P0 for guix-patches@gnu.org; Sun, 21 May 2023 23:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63636] [PATCH 2/2] gnu: pcre2: use git source. Resent-From: Z572 <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 May 2023 03:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63636 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63636@debbugs.gnu.org Received: via spool by 63636-submit@debbugs.gnu.org id=B63636.16847273222287 (code B ref 63636); Mon, 22 May 2023 03:49:02 +0000 Received: (at 63636) by debbugs.gnu.org; 22 May 2023 03:48:42 +0000 Received: from localhost ([127.0.0.1]:33118 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q0wXK-0000ap-6k for submit@debbugs.gnu.org; Sun, 21 May 2023 23:48:42 -0400 Received: from out162-62-58-211.mail.qq.com ([162.62.58.211]:43907) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1q0wXH-0000Zz-Os for 63636@debbugs.gnu.org; Sun, 21 May 2023 23:48:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1684727311; bh=BLfJx/NVMlDLxD5YEM57mMIQVySCs2GBkJ1GD8qgWyc=; h=From:To:Subject:Date:In-Reply-To:References; b=KYmkuyP3ETWwb0IxfN1Vw64T9Dhje9mvdsmPOEWP3e+BynwEp6BIcZKm8ZzIbxmJW mVsB2FVPwKUZ5sttgpio9kPLWi3czOrtA/7IfWiTnkHjpGt+UYRKuFzksnzBorKXBZ JiQ7Qx3qguOMJoGTIHZjw8TzQlyED94ls27oAQUo= Received: from localhost.localdomain ([112.10.199.166]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id C070344D; Mon, 22 May 2023 11:48:07 +0800 X-QQ-mid: xmsmtpt1684727306t0zldohi7 Message-ID: X-QQ-XMAILINFO: NMGzQWUSIfvTAlZV2LMkA0NIRLmneEOfXVBzP8iQCL7KXiZ+ACS8VGSElbI2hE HyzzxhPOALbkGpgGsv/wB3CQKceEym1j4C33HvBryeQsXRjFuxZJeGyjg2/06sd9u0otmBa92eqb 7/+TtWF+g4oExlcwBxfgm0J+PAHMOFUnrM/hBPaexDafwjwco81N44E/om68srm+bCZM/a87sQS/ 54X59a1Ma+NGcw/irNFRvAdt6bgstxhu5w5jmVYjiW2ryZs4pQWmiCoC9rC/afE5wlFonTILIoPt ouuQcoRPZpuWWCXJPCz6g97Clh28TLcqYhmeWUIw+t31onDSqTKVx8IThIMUvXWg3+pb0uhr2LSh 7Ho4tB9+38kg84OxdU2RBUwLPmeOZfL+m1CdgWyzXqeymHIx1eHgBJsNsO5SJCDln/8sV0ZwcbgY XYqsr246NkK8croHso2vFttDkwuUNsUyHpmPy06c8TiSTatfH/bGrtf0lvF8W94bI4UIntqtllE9 JaUzpYEtZA2cpZTDVHK9ZWZ8mtW2Em6A6Guq+pCWf9S6LhHbgBqRezkdKe2MKVnXeCI13hRkeyt6 Su/jy6O6MHBSi3VX26nJMSuqjzJk/RtlAfr7dNWlVigT6ouVXOoYIYZbmmMYxWr4udha62Vs/Gkx 1JZMC28jqOykwMJW9owRMAyzo4QHhPQwL3NVqfF2+fXc8koLx6kmt9Se1bGVYwkT8CFA/BQbF/3r H560wp5//DT21sKhfYyNMf91U9L+a4HfTu1P+QKY/aQzvPAeTsHaAQ3XIIIJ1DLSgjQlN7nj3AhR mJNznJPjj6agVgvBTO+V7FsQVCnNBn5UvEXAPofGPmybuYEUHuTA9f8cNHQLFtR1BBXxCgvcvCTQ B+QGlYhzMf6KfPYxJnj1TX3tfl1gc9riRwkI7q/ryoiC9Ni4ZcUBV+uzOaFYhHsrKmbU+WeUigxE Vf5txxOcBU9YiRG2Tp5w== Date: Mon, 22 May 2023 11:48:06 +0800 X-OQ-MSGID: <2eb1d15ea26df1056cff3cae8f0349971756a15a.1684726234.git.873216071@qq.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 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: Z572 <873216071@qq.com> X-ACL-Warn: , Z572 via Guix-patches X-Patchwork-Original-From: Z572 via Guix-patches via From: Z572 <873216071@qq.com> 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/pcre.scm[source]: use GIT-FETCH. [native-inputs]: add AUTOCONF AUTOMAKE LIBTOOL. --- gnu/packages/pcre.scm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index 769738c3d5..84ca7292b4 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -28,12 +28,14 @@ (define-module (gnu packages pcre) #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages autotools) #:use-module (gnu packages compression) #:use-module (gnu packages readline) #:use-module (gnu packages) #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix build-system gnu)) @@ -96,14 +98,17 @@ (define-public pcre2 (name "pcre2") (version "10.42") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/PCRE2Project/pcre2" - "/releases/download/pcre2-" version - "/pcre2-" version ".tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/PCRE2Project/pcre2") + (commit (string-append "pcre2-" version)))) + (file-name + (git-file-name name version)) (sha256 (base32 - "0h78np8h3dxlmvqvpnj558x67267n08n9zsqncmlqapans6csdld")))) + "1d2kiavdn0wyxv168sz9wd77m3hl46i51fmx4pqya99ydnimpxzb")))) (build-system gnu-build-system) + (native-inputs (list autoconf automake libtool)) (inputs (list bzip2 readline zlib)) (arguments (list #:configure-flags