From 01f877bad7db496e3e25e2c7f20d73f4bde5475f Mon Sep 17 00:00:00 2001 From: Dimitri Fontaine Date: Mon, 16 Apr 2018 15:46:16 +0200 Subject: [PATCH] Testing a change in the way we load CL+SSL. Apparently cl+ssl needs to be reloaded a very specific way at image startup time, and provides a function to do just that. Let's try and use this piece of magic rather cffi:load-foreign-library directly. --- src/hooks.lisp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/hooks.lisp b/src/hooks.lisp index b202be9..f34d405 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 () @@ -25,7 +25,10 @@ (let (#+sbcl (sb-ext:*muffled-warnings* 'style-warning)) ;; we specifically don't load mssql::sybdb eagerly, it's getting loaded ;; in only when the data source is a MS SQL database. - (cffi:load-foreign-library 'cl+ssl::libssl))) + ;; + ;; and for CL+SSL, we need to call the specific reload function that + ;; handles some context and things around loading with CFFI. + (cl+ssl:reload))) #| #+ccl (push #'open-foreign-libs *lisp-startup-functions*)