changeset 35: |
eed390084dba |
parent 34: |
04d40f43430e |
child 36: |
1a531f8e436f |
author: |
ellis <ellis@rwest.io> |
date: |
Sat, 30 Dec 2023 23:23:34 -0500 |
files: |
makefile scripts/install-cargo-tools.sh virt/build-ci-worker.sh |
description: |
install to local/bin |
1.1--- a/makefile Sat Dec 30 22:55:46 2023 -0500
1.2+++ b/makefile Sat Dec 30 23:23:34 2023 -0500
1.3@@ -54,7 +54,7 @@
1.4 ### RocksDB
1.5 ROCKSDB_TARGET:=build/src/rocksdb
1.6 $(ROCKSDB_TARGET):scripts/get-rocksdb.sh $(B);
1.7- $<
1.8+ ./$<
1.9 cd $(ROCKSDB_TARGET) && \
1.10 make shared_lib DISABLE_JEMALLOC=1
1.11 rocksdb:$(ROCKSDB_TARGET)
1.12@@ -70,12 +70,12 @@
1.13 cd $(SBCL_TARGET) && \
1.14 echo '"2.4.1+main"' > version.lisp-expr && \
1.15 sh make.sh \
1.16- # --without-gencgc \
1.17- # --with-mark-region-gc \ # not supported on Alpine, FYI
1.18- # --with-sb-xref-for-internals \ #
1.19- --with-core-compression \
1.20- --dynamic-space-size=8Gb \
1.21- --fancy
1.22+ --without-gencgc \
1.23+ --with-mark-region-gc \ # not supported on Alpine?
1.24+ --with-sb-xref-for-internals \ #
1.25+ --with-core-compression \
1.26+ --dynamic-space-size=8Gb \
1.27+ --fancy
1.28 sbcl:$(SBCL_TARGET)
1.29 sbcl-docs:sbcl;## REQUIRES TEXLIVE
1.30 cd $(SBCL_TARGET)/doc/manual && make
2.1--- a/scripts/install-cargo-tools.sh Sat Dec 30 22:55:46 2023 -0500
2.2+++ b/scripts/install-cargo-tools.sh Sat Dec 30 23:23:34 2023 -0500
2.3@@ -1,10 +1,10 @@
2.4 #!/bin/sh
2.5-cargo install cargo-add
2.6-cargo install cbindgen
2.7-cargo install cargo-asm
2.8-cargo install t-rec
2.9-cargo install trunk
2.10-cargo install tokio-console
2.11+cargo install cargo-add --root /usr/local/
2.12+cargo install cbindgen --root /usr/local/
2.13+cargo install cargo-asm --root /usr/local/
2.14+# cargo install t-rec # requires -lX11
2.15+cargo install trunk --root /usr/local/
2.16+cargo install tokio-console --root /usr/local/
2.17 # cargo install sqlx-cli
2.18-cargo install wasm-bindgen-cli
2.19-cargo install wasm-opt
2.20+cargo install wasm-bindgen-cli --root /usr/local/
2.21+cargo install wasm-opt --root /usr/local/
3.1--- a/virt/build-ci-worker.sh Sat Dec 30 22:55:46 2023 -0500
3.2+++ b/virt/build-ci-worker.sh Sat Dec 30 23:23:34 2023 -0500
3.3@@ -15,8 +15,6 @@
3.4 buildah run --net host $id sh -c 'cd infra && make rocksdb-install'
3.5 buildah run --net host $id sh -c 'cd infra && make sbcl-install'
3.6 buildah run --net host $id sh -c 'cd infra && make ts-langs'
3.7-buildah run --net host $id sh -c 'curl -o /tmp/quicklisp.lisp -O https://beta.quicklisp.org/quicklisp.lisp'
3.8-buildah run --net host $id sh -c 'sbcl --load /tmp/quicklisp.lisp --eval (quicklisp-quickstart:install)'
3.9 buildah run --net host $id sh -c 'cd infra && make dist/fasl'
3.10 buildah run --net host $id sh -c 'mv infra/dist/fasl/* /usr/local/lib/sbcl/'
3.11 buildah run --net host $id sh -c './infra/scripts/install-cargo-tools.sh'