From cd935302129e6ca2acbaa670fb25cce8b5bd6c34 Mon Sep 17 00:00:00 2001 From: SANO Masatoshi Date: Wed, 2 Nov 2016 12:53:53 +0900 Subject: [PATCH] patch for sbcl/1.3.11 linux --- lisp/install-sbcl.lisp | 17 +++++++++-------- lisp/locations.lisp | 1 + 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lisp/install-sbcl.lisp b/lisp/install-sbcl.lisp index 4eb0992..dddb76e 100644 --- a/lisp/install-sbcl.lisp +++ b/lisp/install-sbcl.lisp @@ -103,14 +103,15 @@ (cons (not (get-opt "until-extract")) argv)) (defun sbcl-patch (argv) - #+darwin - (let ((file (merge-pathnames "tmp/sbcl.patch" (homedir))) - (uri (sbcl-patch1-uri))) - (format t "~&Downloading patch: ~A~%" uri) - (download uri file) - (ros.util:chdir (get-opt "src")) - (format t "~%Applying patch:~%") - (uiop/run-program:run-program "patch -p0 -N" :output t :input file :ignore-error-status t)) + (let ((file (merge-pathnames "tmp/sbcl.patch" (homedir)))) + (dolist (uri (list + #+darwin (sbcl-patch1-uri) + #+linux (sbcl-patch2-uri))) + (format t "~&Downloading patch: ~A~%" uri) + (download uri file) + (ros.util:chdir (get-opt "src")) + (format t "~%Applying patch:~%") + (uiop/run-program:run-program "patch -p0 -N" :output t :input file :ignore-error-status t))) (cons t argv)) (defun sbcl-config (argv) diff --git a/lisp/locations.lisp b/lisp/locations.lisp index 1b19ff7..09ae244 100644 --- a/lisp/locations.lisp +++ b/lisp/locations.lisp @@ -32,6 +32,7 @@ (defuri msys2-uri "http://kent.dl.sourceforge.net/project/") (defuri sbcl-patch1-uri "https://gist.githubusercontent.com/snmsts/e8e4fd4bd5e458ac45e8/raw/bb7f1cd2e8e9a914f4e9b1b5acf889ecf75dfe0c/posix-tests.patch") +(defuri sbcl-patch2-uri "https://gist.githubusercontent.com/snmsts/14ca6f57b1730a4c30312e394eb7e914/raw/c55b6176f92038c7573d6d9e4e222861b84158ee/sbcl-1.3.11.patch") (defuri clisp-patch1-uri "https://raw.githubusercontent.com/Homebrew/homebrew/2fb8cb1a2279f80dc89900b3ebaca9e5afc90494/Library/Formula/clisp.rb") (defuri asdf-git-version-uri "https://github.com/roswell/asdf/releases.atom")