[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/19: gnu: pcre: Fix building on riscv64-linux.
From: |
guix-commits |
Subject: |
10/19: gnu: pcre: Fix building on riscv64-linux. |
Date: |
Sun, 8 Aug 2021 04:54:59 -0400 (EDT) |
efraim pushed a commit to branch wip-riscv
in repository guix.
commit 942afad2fe8bae7a23891008c22eb08b72ea4db5
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun Aug 1 11:24:22 2021 +0300
gnu: pcre: Fix building on riscv64-linux.
* gnu/packages/pcre.scm (pcre)[arguments]: Adjust configure-flags to not
build with JIT when building for riscv64-linux.
---
gnu/packages/pcre.scm | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm
index 3187279..315dd8b 100644
--- a/gnu/packages/pcre.scm
+++ b/gnu/packages/pcre.scm
@@ -5,7 +5,7 @@
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2017, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2021 Jean-Baptiste Volatier <jbv@pm.me>
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
@@ -32,6 +32,7 @@
#:use-module (gnu packages)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix utils)
#:use-module (guix build-system gnu))
(define-public pcre
@@ -54,7 +55,7 @@
("readline" ,readline)
("zlib" ,zlib)))
(arguments
- '(#:disallowed-references ("doc")
+ `(#:disallowed-references ("doc")
#:configure-flags '("--enable-utf"
"--enable-pcregrep-libz"
"--enable-pcregrep-libbz2"
@@ -62,7 +63,9 @@
"--enable-unicode-properties"
"--enable-pcre16"
"--enable-pcre32"
- "--enable-jit")
+ ,@(if (target-riscv?)
+ '()
+ `("--enable-jit")))
#:phases (modify-phases %standard-phases
(add-after 'install 'move-static-libs
(lambda* (#:key outputs #:allow-other-keys)
- 02/19: gnu: gcc-boot0: Use libstdc++-boot0-gcc7 on riscv64-linux., (continued)
- 02/19: gnu: gcc-boot0: Use libstdc++-boot0-gcc7 on riscv64-linux., guix-commits, 2021/08/08
- 03/19: new bootstrap binaries, guix-commits, 2021/08/08
- 01/19: WIP: bootstrap: Add support for riscv64-linux., guix-commits, 2021/08/08
- 04/19: gnu: %boot3-inputs: Add missing input., guix-commits, 2021/08/08
- 05/19: gnu: guile: Fix building on riscv64-linux., guix-commits, 2021/08/08
- 06/19: gnu: %final-inputs: Add implied gcc:lib input., guix-commits, 2021/08/08
- 08/19: utils: Define 'target-riscv?' predicate., guix-commits, 2021/08/08
- 09/19: gnu: elfutils: Fix building on riscv64-linux., guix-commits, 2021/08/08
- 07/19: gnu: bdb: Fix building on riscv64-linux., guix-commits, 2021/08/08
- 12/19: gnu: libtool: Fix building on riscv64-linux., guix-commits, 2021/08/08
- 10/19: gnu: pcre: Fix building on riscv64-linux.,
guix-commits <=
- 11/19: gnu: openssl: Fix build on riscv64-linux., guix-commits, 2021/08/08
- 14/19: gnu: mesa: Add support for riscv64-linux., guix-commits, 2021/08/08
- 19/19: gnu: icu4c: Skip tests on riscv64-linux., guix-commits, 2021/08/08
- 15/19: gnu: pcre2: Fix building on riscv64-linux., guix-commits, 2021/08/08
- 16/19: gnu: ruby-2.7: Update to 2.7.4., guix-commits, 2021/08/08
- 13/19: gnu: openblas: Fix building on riscv64-linux., guix-commits, 2021/08/08
- 18/19: fixup libstdc++-boot0-gcc7, guix-commits, 2021/08/08
- 17/19: fixup elfutils, guix-commits, 2021/08/08