58 lines
2.4 KiB
Diff
58 lines
2.4 KiB
Diff
From aed1c4b0be7576d20eed81070da2c6f92573df18 Mon Sep 17 00:00:00 2001
|
|
From: Keshav Kini <keshav.kini@gmail.com>
|
|
Date: Sat, 30 May 2020 21:27:47 -0700
|
|
Subject: [PATCH] Fix some paths for Nix build
|
|
|
|
---
|
|
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(-)
|
|
|
|
diff --git a/books/build/features.sh b/books/build/features.sh
|
|
index feb5b2b59c..4b654e08bc 100755
|
|
--- a/books/build/features.sh
|
|
+++ b/books/build/features.sh
|
|
@@ -125,6 +125,7 @@ EOF
|
|
fi
|
|
|
|
echo "Determining whether an ipasir shared library is installed" 1>&2
|
|
+IPASIR_SHARED_LIBRARY=${IPASIR_SHARED_LIBRARY:-@libipasir@}
|
|
if check_ipasir; then
|
|
cat >> Makefile-features <<EOF
|
|
export OS_HAS_IPASIR ?= 1
|
|
diff --git a/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp b/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp
|
|
index 762e4ad4c0..c9802cb582 100644
|
|
--- a/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp
|
|
+++ b/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp
|
|
@@ -30,11 +30,7 @@
|
|
|
|
(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))))
|
|
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
|
|
;;
|
|
;; These are 32-bit only.
|
|
|
|
+(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"
|
|
--
|
|
2.31.1
|
|
|