changeset 55: |
2e515a33787e |
parent 54: |
3acc3526d836 |
child 56: |
74e69c49e525 |
author: |
ellis <ellis@rwest.io> |
date: |
Wed, 03 Jan 2024 16:40:25 -0500 |
files: |
makefile scripts/quicklisp-install.sh virt/build-ci-worker.sh |
description: |
quicklisp patching |
1.1--- a/makefile Wed Jan 03 14:56:40 2024 -0500
1.2+++ b/makefile Wed Jan 03 16:40:25 2024 -0500
1.3@@ -84,9 +84,10 @@
1.4 cd $(SBCL_TARGET)/doc/manual && make
1.5 sbcl-install:sbcl;cd $(SBCL_TARGET) && ./install.sh
1.6 clean-sbcl:$(SBCL_TARGET);cd $(SBCL_TARGET) && ./clean.sh
1.7+
1.8 build/quicklisp.lisp:$(B);cd $< && curl -O https://beta.quicklisp.org/quicklisp.lisp
1.9-quicklisp-install:build/quicklisp.lisp
1.10- sbcl --load $< --eval '(quicklisp-quickstart:install)'
1.11+quicklisp-install:scripts/quicklisp-install.sh build/quicklisp.lisp;$<
1.12+
1.13 ### Rust
1.14 RUST_TARGET:=build/src/rust
1.15 $(RUST_TARGET):scripts/get-rust.sh $(B);$<
2.1--- /dev/null Thu Jan 01 00:00:00 1970 +0000
2.2+++ b/scripts/quicklisp-install.sh Wed Jan 03 16:40:25 2024 -0500
2.3@@ -0,0 +1,20 @@
2.4+#!/bin/sh
2.5+if [ -z "$QUICKLISP_DIST_VERSION" ] || [ "$QUICKLISP_DIST_VERSION" = "latest" ]; then
2.6+ QUICKLISP_DIST_VERSION=nil
2.7+else
2.8+ QUICKLISP_DIST_VERSION="\"quicklisp/$QUICKLISP_DIST_VERSION\""
2.9+fi
2.10+
2.11+if [ -z "$QUICKLISP_CLIENT_VERSION" ] || [ "$QUICKLISP_CLIENT_VERSION" = "latest" ]; then
2.12+ QUICKLISP_CLIENT_VERSION=nil
2.13+else
2.14+ QUICKLISP_CLIENT_VERSION="\"$QUICKLISP_CLIENT_VERSION\""
2.15+fi
2.16+
2.17+sbcl --non-interactive \
2.18+ --load build/quicklisp.lisp \
2.19+ --eval "(quicklisp-quickstart:install :dist-version $QUICKLISP_DIST_VERSION :client-version $QUICKLISP_CLIENT_VERSION)" \
2.20+ --eval "(when (equalp \"$QUICKLISP_ADD_TO_INIT_FILE\" \"true\") (ql-util:without-prompting (ql:add-to-init-file)))"
2.21+
2.22+mkdir -pv /usr/local/share/lisp
2.23+cp build/quicklisp.lisp /usr/local/share/lisp/
3.1--- a/virt/build-ci-worker.sh Wed Jan 03 14:56:40 2024 -0500
3.2+++ b/virt/build-ci-worker.sh Wed Jan 03 16:40:25 2024 -0500
3.3@@ -14,6 +14,7 @@
3.4 buildah config --volume /store $id
3.5 buildah run --net host $id hg clone https://vc.compiler.company/comp/infra
3.6 buildah config --workingdir /infra $id
3.7+buildah config --env QUICKLISP_ADD_TO_INIT_FILE=true
3.8 buildah run --net host $id sh -c 'make worker -j4'
3.9 buildah run --net host $id sh -c 'scripts/install-cargo-tools.sh'
3.10 buildah run --net host $id sh -c 'make clean'