aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2022-11-18 10:39:07 +0100
committerMarius Bakke <marius@gnu.org>2022-11-20 07:47:16 +0100
commitb187864f36e7f8ce584a002d28b275c6bf9fced2 (patch)
tree6b768f4f28335f3d88014dbae7bd991d9498ff8a
parentb1e802034d6896053f784a067d66d940a5897ae8 (diff)
downloadguix-b187864f36e7f8ce584a002d28b275c6bf9fced2.tar.gz
guix-b187864f36e7f8ce584a002d28b275c6bf9fced2.zip
gnu: sbcl: Resolve TODO.
* gnu/packages/lisp.scm (sbcl)[source](modules, snippet): New fields. [arguments]: Remove phase.
-rw-r--r--gnu/packages/lisp.scm15
1 files changed, 7 insertions, 8 deletions
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 80018f8e1a..cd9d6762a9 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -430,7 +430,13 @@ an interpreter, a compiler, a debugger, and much more.")
(uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-"
version "-source.tar.bz2"))
(sha256
- (base32 "0cq8x4svkawirxq5s5gs4qxkl23m4q5p722a2kpss8qjfslc7hwc"))))
+ (base32 "0cq8x4svkawirxq5s5gs4qxkl23m4q5p722a2kpss8qjfslc7hwc"))
+ (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
@@ -476,13 +482,6 @@ an interpreter, a compiler, a debugger, and much more.")
(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.