diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2021-12-19 15:15:11 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2021-12-19 15:15:11 +0200 |
| commit | 6ccf8ea81f95963c0b7f945648106576008ee105 (patch) | |
| tree | f39f596e6c3e98ff1e9f1de0ad41c977e9dd37c1 /gnu/packages/pcre.scm | |
| parent | fcaed5b81e893f34d77527fbef389ca628ca882d (diff) | |
| parent | 9f916d14765b00309c742fcbff0cfabdd10dcf05 (diff) | |
| download | guix-6ccf8ea81f95963c0b7f945648106576008ee105.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/pcre.scm')
| -rw-r--r-- | gnu/packages/pcre.scm | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index e11d7c23fb..0324a21261 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -51,11 +51,9 @@ "bin" ;depends on Readline (adds 20MiB to the closure) "doc" ;1.8 MiB of HTML "static")) ;1.8 MiB static libraries - (inputs `(("bzip2" ,bzip2) - ("readline" ,readline) - ("zlib" ,zlib))) + (inputs (list bzip2 readline zlib)) (arguments - '(#:disallowed-references ("doc") + `(#:disallowed-references ("doc") #:configure-flags '("--enable-utf" "--enable-pcregrep-libz" "--enable-pcregrep-libbz2" @@ -63,7 +61,10 @@ "--enable-unicode-properties" "--enable-pcre16" "--enable-pcre32" - "--enable-jit") + ;; pcretest fails on powerpc32. + ,@(if (target-ppc32?) + '() + `("--enable-jit"))) #:phases (modify-phases %standard-phases (add-after 'install 'move-static-libs (lambda* (#:key outputs #:allow-other-keys) @@ -96,9 +97,7 @@ POSIX regular expression API.") (base32 "0w6jaswjmg3bc0wsw6msn5bvk66p90kf2asnnj9rhll0idpak5ad")))) (build-system gnu-build-system) - (inputs `(("bzip2" ,bzip2) - ("readline" ,readline) - ("zlib" ,zlib))) + (inputs (list bzip2 readline zlib)) (arguments `(#:configure-flags '("--enable-unicode" "--enable-pcre2grep-libz" |