2022-07-27 20:10:17 +00:00
|
|
|
From aed1c4b0be7576d20eed81070da2c6f92573df18 Mon Sep 17 00:00:00 2001
|
acl2, acl2-minimal: build standard library, init
Before this commit, we only built the main ACL2 executable. Most users
will also want the standard library (the "Community Books"), so after
this commit, we build the entire `make everything` suite, which includes
essentially everything provided in the ACL2 repository.
There's also a new top-level package called `acl2-minimal` which has
just the core ACL2 executable, for those who really only want that.
Future work: modularize the build so that we can support multiple
different subsets of the standard library. A lot of the stuff in this
complete build is probably superfluous to almost all users. Also,
because some of the books have unclear or idiosyncratic licenses, the
full build will not be cached on cache.nixos.org, and installing it will
mean spending a few hours building it. So it would be good to have a
pared down build which excluded non-free books and things that people
rarely or never use.
2020-02-24 05:12:37 +00:00
|
|
|
From: Keshav Kini <keshav.kini@gmail.com>
|
|
|
|
|
Date: Sat, 30 May 2020 21:27:47 -0700
|
2021-08-15 00:00:27 +00:00
|
|
|
Subject: [PATCH] Fix some paths for Nix build
|
acl2, acl2-minimal: build standard library, init
Before this commit, we only built the main ACL2 executable. Most users
will also want the standard library (the "Community Books"), so after
this commit, we build the entire `make everything` suite, which includes
essentially everything provided in the ACL2 repository.
There's also a new top-level package called `acl2-minimal` which has
just the core ACL2 executable, for those who really only want that.
Future work: modularize the build so that we can support multiple
different subsets of the standard library. A lot of the stuff in this
complete build is probably superfluous to almost all users. Also,
because some of the books have unclear or idiosyncratic licenses, the
full build will not be cached on cache.nixos.org, and installing it will
mean spending a few hours building it. So it would be good to have a
pared down build which excluded non-free books and things that people
rarely or never use.
2020-02-24 05:12:37 +00:00
|
|
|
|
|
|
|
|
---
|
2022-07-27 20:10:17 +00:00
|
|
|
books/build/features.sh | 1 +
|
|
|
|
|
books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp | 6 +-----
|
|
|
|
|
.../bundle/software/cl+ssl-20220707-git/src/reload.lisp | 3 +++
|
|
|
|
|
3 files changed, 5 insertions(+), 5 deletions(-)
|
acl2, acl2-minimal: build standard library, init
Before this commit, we only built the main ACL2 executable. Most users
will also want the standard library (the "Community Books"), so after
this commit, we build the entire `make everything` suite, which includes
essentially everything provided in the ACL2 repository.
There's also a new top-level package called `acl2-minimal` which has
just the core ACL2 executable, for those who really only want that.
Future work: modularize the build so that we can support multiple
different subsets of the standard library. A lot of the stuff in this
complete build is probably superfluous to almost all users. Also,
because some of the books have unclear or idiosyncratic licenses, the
full build will not be cached on cache.nixos.org, and installing it will
mean spending a few hours building it. So it would be good to have a
pared down build which excluded non-free books and things that people
rarely or never use.
2020-02-24 05:12:37 +00:00
|
|
|
|
|
|
|
|
diff --git a/books/build/features.sh b/books/build/features.sh
|
2022-07-27 20:10:17 +00:00
|
|
|
index feb5b2b59c..4b654e08bc 100755
|
acl2, acl2-minimal: build standard library, init
Before this commit, we only built the main ACL2 executable. Most users
will also want the standard library (the "Community Books"), so after
this commit, we build the entire `make everything` suite, which includes
essentially everything provided in the ACL2 repository.
There's also a new top-level package called `acl2-minimal` which has
just the core ACL2 executable, for those who really only want that.
Future work: modularize the build so that we can support multiple
different subsets of the standard library. A lot of the stuff in this
complete build is probably superfluous to almost all users. Also,
because some of the books have unclear or idiosyncratic licenses, the
full build will not be cached on cache.nixos.org, and installing it will
mean spending a few hours building it. So it would be good to have a
pared down build which excluded non-free books and things that people
rarely or never use.
2020-02-24 05:12:37 +00:00
|
|
|
--- a/books/build/features.sh
|
|
|
|
|
+++ b/books/build/features.sh
|
2022-07-27 20:10:17 +00:00
|
|
|
@@ -125,6 +125,7 @@ EOF
|
2021-08-15 00:00:27 +00:00
|
|
|
fi
|
acl2, acl2-minimal: build standard library, init
Before this commit, we only built the main ACL2 executable. Most users
will also want the standard library (the "Community Books"), so after
this commit, we build the entire `make everything` suite, which includes
essentially everything provided in the ACL2 repository.
There's also a new top-level package called `acl2-minimal` which has
just the core ACL2 executable, for those who really only want that.
Future work: modularize the build so that we can support multiple
different subsets of the standard library. A lot of the stuff in this
complete build is probably superfluous to almost all users. Also,
because some of the books have unclear or idiosyncratic licenses, the
full build will not be cached on cache.nixos.org, and installing it will
mean spending a few hours building it. So it would be good to have a
pared down build which excluded non-free books and things that people
rarely or never use.
2020-02-24 05:12:37 +00:00
|
|
|
|
|
|
|
|
echo "Determining whether an ipasir shared library is installed" 1>&2
|
2021-08-15 00:00:27 +00:00
|
|
|
+IPASIR_SHARED_LIBRARY=${IPASIR_SHARED_LIBRARY:-@libipasir@}
|
|
|
|
|
if check_ipasir; then
|
|
|
|
|
cat >> Makefile-features <<EOF
|
|
|
|
|
export OS_HAS_IPASIR ?= 1
|
acl2, acl2-minimal: build standard library, init
Before this commit, we only built the main ACL2 executable. Most users
will also want the standard library (the "Community Books"), so after
this commit, we build the entire `make everything` suite, which includes
essentially everything provided in the ACL2 repository.
There's also a new top-level package called `acl2-minimal` which has
just the core ACL2 executable, for those who really only want that.
Future work: modularize the build so that we can support multiple
different subsets of the standard library. A lot of the stuff in this
complete build is probably superfluous to almost all users. Also,
because some of the books have unclear or idiosyncratic licenses, the
full build will not be cached on cache.nixos.org, and installing it will
mean spending a few hours building it. So it would be good to have a
pared down build which excluded non-free books and things that people
rarely or never use.
2020-02-24 05:12:37 +00:00
|
|
|
diff --git a/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp b/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp
|
2022-07-27 20:10:17 +00:00
|
|
|
index 762e4ad4c0..c9802cb582 100644
|
acl2, acl2-minimal: build standard library, init
Before this commit, we only built the main ACL2 executable. Most users
will also want the standard library (the "Community Books"), so after
this commit, we build the entire `make everything` suite, which includes
essentially everything provided in the ACL2 repository.
There's also a new top-level package called `acl2-minimal` which has
just the core ACL2 executable, for those who really only want that.
Future work: modularize the build so that we can support multiple
different subsets of the standard library. A lot of the stuff in this
complete build is probably superfluous to almost all users. Also,
because some of the books have unclear or idiosyncratic licenses, the
full build will not be cached on cache.nixos.org, and installing it will
mean spending a few hours building it. So it would be good to have a
pared down build which excluded non-free books and things that people
rarely or never use.
2020-02-24 05:12:37 +00:00
|
|
|
--- a/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp
|
|
|
|
|
+++ b/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp
|
2021-08-15 00:00:27 +00:00
|
|
|
@@ -30,11 +30,7 @@
|
acl2, acl2-minimal: build standard library, init
Before this commit, we only built the main ACL2 executable. Most users
will also want the standard library (the "Community Books"), so after
this commit, we build the entire `make everything` suite, which includes
essentially everything provided in the ACL2 repository.
There's also a new top-level package called `acl2-minimal` which has
just the core ACL2 executable, for those who really only want that.
Future work: modularize the build so that we can support multiple
different subsets of the standard library. A lot of the stuff in this
complete build is probably superfluous to almost all users. Also,
because some of the books have unclear or idiosyncratic licenses, the
full build will not be cached on cache.nixos.org, and installing it will
mean spending a few hours building it. So it would be good to have a
pared down build which excluded non-free books and things that people
rarely or never use.
2020-02-24 05:12:37 +00:00
|
|
|
|
2021-08-15 00:00:27 +00:00
|
|
|
(er-let* ((libname (acl2::getenv$ "IPASIR_SHARED_LIBRARY" acl2::*the-live-state*)))
|
|
|
|
|
(handler-case
|
|
|
|
|
- (cffi::load-foreign-library
|
|
|
|
|
- (or libname
|
|
|
|
|
- (cw "WARNING: $IPASIR_SHARED_LIBRARY not specified, ~
|
|
|
|
|
- defaulting to \"libipasirglucose4.so\"")
|
|
|
|
|
- "libipasirglucose4.so"))
|
|
|
|
|
+ (cffi::load-foreign-library (or libname "@libipasir@"))
|
|
|
|
|
(error () (er hard? 'load-ipasir-shardlib-raw
|
|
|
|
|
"Couldn't load ipasir shared library from ~s0."
|
|
|
|
|
libname))))
|
2022-07-27 20:10:17 +00:00
|
|
|
diff --git a/books/quicklisp/bundle/software/cl+ssl-20220707-git/src/reload.lisp b/books/quicklisp/bundle/software/cl+ssl-20220707-git/src/reload.lisp
|
|
|
|
|
index d409b4440f..5c65c5b4da 100644
|
|
|
|
|
--- a/books/quicklisp/bundle/software/cl+ssl-20220707-git/src/reload.lisp
|
|
|
|
|
+++ b/books/quicklisp/bundle/software/cl+ssl-20220707-git/src/reload.lisp
|
|
|
|
|
@@ -87,6 +87,9 @@ sudo rm /usr/local/lib/libcrypto.dylib /usr/local/lib/libssl.dylib
|
|
|
|
|
;;
|
2021-08-15 00:00:27 +00:00
|
|
|
;; These are 32-bit only.
|
acl2, acl2-minimal: build standard library, init
Before this commit, we only built the main ACL2 executable. Most users
will also want the standard library (the "Community Books"), so after
this commit, we build the entire `make everything` suite, which includes
essentially everything provided in the ACL2 repository.
There's also a new top-level package called `acl2-minimal` which has
just the core ACL2 executable, for those who really only want that.
Future work: modularize the build so that we can support multiple
different subsets of the standard library. A lot of the stuff in this
complete build is probably superfluous to almost all users. Also,
because some of the books have unclear or idiosyncratic licenses, the
full build will not be cached on cache.nixos.org, and installing it will
mean spending a few hours building it. So it would be good to have a
pared down build which excluded non-free books and things that people
rarely or never use.
2020-02-24 05:12:37 +00:00
|
|
|
|
2022-07-27 20:10:17 +00:00
|
|
|
+(cl+ssl/config:define-libssl-path "@libssl@")
|
|
|
|
|
+(cl+ssl/config:define-libcrypto-path "@libcrypto@")
|
|
|
|
|
+
|
|
|
|
|
(unless cl+ssl/config::*libcrypto-override*
|
|
|
|
|
(cffi:define-foreign-library libcrypto
|
|
|
|
|
(:windows (:or #+(and windows x86-64) "libcrypto-1_1-x64.dll"
|
acl2, acl2-minimal: build standard library, init
Before this commit, we only built the main ACL2 executable. Most users
will also want the standard library (the "Community Books"), so after
this commit, we build the entire `make everything` suite, which includes
essentially everything provided in the ACL2 repository.
There's also a new top-level package called `acl2-minimal` which has
just the core ACL2 executable, for those who really only want that.
Future work: modularize the build so that we can support multiple
different subsets of the standard library. A lot of the stuff in this
complete build is probably superfluous to almost all users. Also,
because some of the books have unclear or idiosyncratic licenses, the
full build will not be cached on cache.nixos.org, and installing it will
mean spending a few hours building it. So it would be good to have a
pared down build which excluded non-free books and things that people
rarely or never use.
2020-02-24 05:12:37 +00:00
|
|
|
--
|
2021-08-15 00:00:27 +00:00
|
|
|
2.31.1
|
acl2, acl2-minimal: build standard library, init
Before this commit, we only built the main ACL2 executable. Most users
will also want the standard library (the "Community Books"), so after
this commit, we build the entire `make everything` suite, which includes
essentially everything provided in the ACL2 repository.
There's also a new top-level package called `acl2-minimal` which has
just the core ACL2 executable, for those who really only want that.
Future work: modularize the build so that we can support multiple
different subsets of the standard library. A lot of the stuff in this
complete build is probably superfluous to almost all users. Also,
because some of the books have unclear or idiosyncratic licenses, the
full build will not be cached on cache.nixos.org, and installing it will
mean spending a few hours building it. So it would be good to have a
pared down build which excluded non-free books and things that people
rarely or never use.
2020-02-24 05:12:37 +00:00
|
|
|
|
