From 3407a47c2afa6cd53b6372835b04f46a3c3fccd9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 18 Nov 2022 10:39:07 +0100 Subject: gnu: sbcl: Resolve TODO. * gnu/packages/lisp.scm (sbcl)[source](modules, snippet): New fields. [arguments]: Remove phase. --- gnu/packages/lisp.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'gnu/packages/lisp.scm') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index a8ee627d57..4f1243e8c0 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -435,7 +435,13 @@ (define-public sbcl (uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-" version "-source.tar.bz2")) (sha256 - (base32 "1ahyrc3p9cf7y5zbgzvb9yxa8a480ccis4ksijlajck3z8n1dk24")))) + (base32 "1ahyrc3p9cf7y5zbgzvb9yxa8a480ccis4ksijlajck3z8n1dk24")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Don't force ARMv5. + (substitute* "src/runtime/Config.arm-linux" + (("-march=armv5") "")))))) (build-system gnu-build-system) (outputs '("out" "doc")) (native-inputs @@ -481,13 +487,6 @@ (define-public sbcl (srfi srfi-1)) #:phases (modify-phases %standard-phases - ,@(if (target-arm32?) - ;; TODO: Move to snippet in staging. - `((add-after 'unpack 'dont-force-armv5 - (lambda _ - (substitute* "src/runtime/Config.arm-linux" - (("-march=armv5") ""))))) - '()) (delete 'configure) (add-after 'unpack 'fix-build-id ;; One of the build scripts makes a build id using the current date. -- cgit v1.2.3