amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: pcre2: Use G-expression.

Browse source 
* gnu/packages/pcre.scm (pcre2)[arguments]: Convert to gexp.
This commit is contained in:
Marius Bakke 2022-06-30 16:03:56 +02:00
parent dad7117c35
commit 14cd7675a3
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 29 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/pcre.scm
View file

@ -3,7 +3,7 @@
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017, 2021, 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
@ -33,6 +33,7 @@
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix build-system gnu)) #:use-module (guix build-system gnu))
@ -103,7 +104,8 @@ POSIX regular expression API.")
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (list bzip2 readline zlib)) (inputs (list bzip2 readline zlib))
(arguments (arguments
`(#:configure-flags '("--enable-unicode" (list #:configure-flags
#~'("--enable-unicode"
"--enable-pcre2grep-libz" "--enable-pcre2grep-libz"
"--enable-pcre2grep-libbz2" "--enable-pcre2grep-libbz2"
"--enable-pcre2test-libreadline" "--enable-pcre2test-libreadline"
@ -111,13 +113,12 @@ POSIX regular expression API.")
"--enable-pcre2-32" "--enable-pcre2-32"
;; pcre2_jit_test fails on powerpc32. ;; pcre2_jit_test fails on powerpc32.
;; riscv64-linux is an unsupported architecture. ;; riscv64-linux is an unsupported architecture.
,@(if (or (target-ppc32?) #$@(if (or (target-ppc32?) (target-riscv64?))
(target-riscv64?)) #~()
'() #~("--enable-jit"))
`("--enable-jit"))
"--disable-static") "--disable-static")
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'patch-paths (add-after 'unpack 'patch-paths
(lambda _ (lambda _
(substitute* "RunGrepTest" (substitute* "RunGrepTest"