From d4737a39ca8702e32ad0a47941f93fef2872966f Mon Sep 17 00:00:00 2001 From: Dimitri Fontaine Date: Sat, 5 Mar 2016 22:45:59 +0100 Subject: [PATCH] Leave ssl lib alone in src/hooks.lisp. That means we no longer eagerly load it when we think we will need it, and also refrain from unloading it from the binary at image saving time. In my local tests, doing so fix #330 by avoiding the error entirely in the docker image, where obviously the libs found at build-time are found again at the same place at run time. --- src/hooks.lisp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/hooks.lisp b/src/hooks.lisp index 7ba15f4..c9eb57f 100644 --- a/src/hooks.lisp +++ b/src/hooks.lisp @@ -17,7 +17,7 @@ (defun close-foreign-libs () "Close Foreign libs in use by pgloader at application save time." (let (#+sbcl (sb-ext:*muffled-warnings* 'style-warning)) - (mapc #'cffi:close-foreign-library '(cl+ssl::libssl + (mapc #'cffi:close-foreign-library '(;; cl+ssl::libssl mssql::sybdb)))) (defun open-foreign-libs () @@ -27,8 +27,10 @@ ;; in only when the data source is a MS SQL database. (cffi:load-foreign-library 'cl+ssl::libssl))) +#| #+ccl (push #'open-foreign-libs *lisp-startup-functions*) #+sbcl (push #'open-foreign-libs sb-ext:*init-hooks*) +|# #+ccl (push #'close-foreign-libs *save-exit-functions*) #+sbcl (push #'close-foreign-libs sb-ext:*save-hooks*)