From bf8d709a2b29f30ceaa6a48b842b4b16a8c99b13 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Tue, 25 Nov 2003 06:37:14 +0000 Subject: [PATCH] r8270: fix loading on non-linux platforms --- clsql-mysql.asd | 9 ++++++--- db-mysql/mysql-loader.lisp | 1 - debian/changelog | 6 ++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/clsql-mysql.asd b/clsql-mysql.asd index ec4e5ef..815709e 100644 --- a/clsql-mysql.asd +++ b/clsql-mysql.asd @@ -26,15 +26,18 @@ ()) (defmethod output-files ((o compile-op) (c clsql-mysql-source-file)) - (let ((found (some #'(lambda (dir) + (let* ((library-file-type + (funcall (intern (symbol-name'#:default-foreign-library-type) + (symbol-name '#:uffi)))) + (found (some #'(lambda (dir) (probe-file (make-pathname :directory dir :name (component-name c) - :type "so"))) + :type library-file-type))) '((:absolute "usr" "lib" "clsql"))))) (list (if found found (make-pathname :name (component-name c) - :type "so" + :type library-file-type :directory *library-file-dir*))))) (defmethod perform ((o load-op) (c clsql-mysql-source-file)) diff --git a/db-mysql/mysql-loader.lisp b/db-mysql/mysql-loader.lisp index db40150..cafa2e6 100644 --- a/db-mysql/mysql-loader.lisp +++ b/db-mysql/mysql-loader.lisp @@ -16,7 +16,6 @@ ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;;; ************************************************************************* -(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0))) (in-package :mysql) ;;;; Modified by Kevin Rosenberg diff --git a/debian/changelog b/debian/changelog index 801e2f9..cc1bc25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-sql (1.8.5-1) unstable; urgency=low + + * Fix loading on db-mysql/mysql.so on non-linux platforms + + -- Kevin M. Rosenberg Mon, 24 Nov 2003 23:17:25 -0700 + cl-sql (1.8.4-1) unstable; urgency=low * Fix typo in error string -- 2.34.1