efraim pushed a commit to branch wip-riscv
in repository guix.
commit 7cf7a96c598411d0f1a78491d47e67269b664f73
Author: Efraim Flashner <[email protected]>
AuthorDate: Sun Aug 8 16:31:25 2021 +0300
gnu: libantlr3c: Simply configure.
* gnu/packages/java.scm (libantlr3c)[arguments]: Remove custom
'configure phase. Move '--enable-64bit' to configure-flags, conditional
on being for a 64-bit platform.
---
gnu/packages/java.scm | 25 ++++++-------------------
1 file changed, 6 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index fb67712..08ef7a8 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -9,7 +9,7 @@
;;; Copyright © 2017, 2019, 2021 Tobias Geerinckx-Rice <[email protected]>
;;; Copyright © 2018, 2019 Gábor Boskovits <[email protected]>
;;; Copyright © 2018 Chris Marusich <[email protected]>
-;;; Copyright © 2018, 2019, 2020 Efraim Flashner <[email protected]>
+;;; Copyright © 2018, 2019, 2020, 2021 Efraim Flashner <[email protected]>
;;; Copyright © 2019, 2020, 2021 Björn Höfling
<[email protected]>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <[email protected]>
;;; Copyright © 2020 Raghav Gururajan <[email protected]>
@@ -130,24 +130,11 @@
(base32 "0lpbnb4dq4azmsvlhp6khq1gy42kyqyjv8gww74g5lm2y6blm4fa"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags (list "--enable-debuginfo" "--disable-static")
- #:phases (modify-phases %standard-phases
- (replace 'configure
- (lambda* (#:key build target native-inputs inputs outputs
- (configure-flags '()) out-of-source? system
- #:allow-other-keys)
- (let ((configure (assoc-ref %standard-phases 'configure))
- (enable-64bit? (member system '("aarch64-linux"
- "x86_64-linux"
-
"mips64el-linux"))))
- (configure #:build build #:target target
- #:native-inputs native-inputs
- #:inputs inputs #:outputs outputs
- #:configure-flags `(,(if enable-64bit?
- "--enable-64bit"
- '())
- ,@configure-flags)
- #:out-of-source? out-of-source?)))))))
+ `(#:configure-flags (list "--enable-debuginfo"
+ "--disable-static"
+ ,@(if (target-64bit?)
+ `("--enable-64bit")
+ '()))))
(synopsis "ANTLR C Library")
(description "LIBANTLR3C provides run-time C libraries for ANTLR3 (ANother
Tool for Language Recognition v3).")
