GNU bug report logs - #63636
[PATCH core-updates 0/2] pcre2: update to 10.42.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 63636 in the body.
You can then email your comments to 63636 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Z572 <873216071 <at> qq.com>
To: guix-patches <at> gnu.org
Subject: [PATCH core-updates 0/2] pcre2: update to 10.42.
Date: Mon, 22 May 2023 11:34:37 +0800

*** BLURB HERE ***

Zheng Junjie (2):
  gnu: pcre2: Update to 10.42.
  gnu: pcre2: use git source.

 gnu/packages/pcre.scm | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)


base-commit: 8659f5e3ee1872da0a853ca6f839eb6f90e10c3d
-- 
2.40.1

Message #8 received at 63636 <at> debbugs.gnu.org (full text, mbox):

From: Z572 <873216071 <at> qq.com>
To: 63636 <at> debbugs.gnu.org
Subject: [PATCH 1/2] gnu: pcre2: Update to 10.42.
Date: Mon, 22 May 2023 11:48:05 +0800

* 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 <me <at> tobias.gr>
 ;;; Copyright © 2021 Jean-Baptiste Volatier <jbv <at> pm.me>
 ;;; Copyright © 2021 Simon Tournier <zimon.toutoune <at> gmail.com>
+;;; Copyright © 2023 Zheng Junjie <873216071 <at> 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")
-- 
2.40.1

Message #11 received at 63636 <at> debbugs.gnu.org (full text, mbox):

From: Z572 <873216071 <at> qq.com>
To: 63636 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: pcre2: use git source.
Date: Mon, 22 May 2023 11:48:06 +0800

* 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
-- 
2.40.1

Message #16 received at 63636-done <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Z572 <873216071 <at> qq.com>
Cc: 63636-done <at> debbugs.gnu.org
Subject: Re: [bug#63636] [PATCH 2/2] gnu: pcre2: use git source.
Date: Sun, 21 Jan 2024 23:32:42 -0500

Hi,

Z572 <873216071 <at> qq.com> writes:

> * gnu/packages/pcre.scm[source]: use GIT-FETCH.
> [native-inputs]: add AUTOCONF AUTOMAKE LIBTOOL.

I've pushed the update in 388bdc495d, but not the switch to git fetch as
this would increase the closure of core packages such as grep.

That would need to be investigated whether it'd cause a bootstrapping
problem.

-- 
Thanks,
Maxim

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.