From eb9d92a3c98130c7fe3b1bbc63dcfe285d02aba2 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Wed, 21 Apr 2004 02:06:15 +0000 Subject: [PATCH] r9116: Automated commit for Debian build of clsql upstream-version-2.9.1 --- clsql-mysql.asd | 19 +++++++++++-------- clsql-uffi.asd | 17 ++++++++++------- debian/changelog | 6 ++++++ 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/clsql-mysql.asd b/clsql-mysql.asd index 72b961f..7c77bab 100644 --- a/clsql-mysql.asd +++ b/clsql-mysql.asd @@ -45,10 +45,12 @@ :directory *library-file-dir*))))) (defmethod perform ((o load-op) (c clsql-mysql-source-file)) - nil) ;;; library will be loaded by a loader file + t) (defmethod operation-done-p ((o load-op) (c clsql-mysql-source-file)) - nil) + (and (symbol-function (intern (symbol-name '#:mysql-get-client-info) + (find-package '#:mysql))) + t)) (defmethod perform ((o compile-op) (c clsql-mysql-source-file)) #-(or win32 mswindows) @@ -61,10 +63,11 @@ (error 'operation-error :component c :operation o))) (defmethod operation-done-p ((o compile-op) (c clsql-mysql-source-file)) - (let ((lib (make-pathname :defaults (component-pathname c) - :type (uffi:default-foreign-library-type)))) - (and (probe-file lib) - (> (file-write-date lib) (file-write-date (component-pathname c)))))) + (or (and (probe-file #p"/usr/lib/clsql/mysql.so") t) + (let ((lib (make-pathname :defaults (component-pathname c) + :type (uffi:default-foreign-library-type)))) + (and (probe-file lib) + (> (file-write-date lib) (file-write-date (component-pathname c))))))) ;;; System definition @@ -81,8 +84,8 @@ :components ((:module :db-mysql :components - ((:clsql-mysql-source-file "mysql") - (:file "mysql-package") + ((:file "mysql-package") + (:clsql-mysql-source-file "mysql" :depends-on ("mysql-package")) (:file "mysql-loader" :depends-on ("mysql-package" "mysql")) (:file "mysql-client-info" :depends-on ("mysql-loader")) (:file "mysql-api" :depends-on ("mysql-client-info")) diff --git a/clsql-uffi.asd b/clsql-uffi.asd index 49ae32d..fb22dc1 100644 --- a/clsql-uffi.asd +++ b/clsql-uffi.asd @@ -54,7 +54,9 @@ nil) ;;; library will be loaded by a loader file (defmethod operation-done-p ((o load-op) (c clsql-uffi-source-file)) - nil) + (and (symbol-function (intern (symbol-name '#:atol64) + (find-package '#:clsql-uffi))) + t)) (defmethod perform ((o compile-op) (c clsql-uffi-source-file)) #-(or win32 mswindows) @@ -67,10 +69,11 @@ (error 'operation-error :component c :operation o))) (defmethod operation-done-p ((o compile-op) (c clsql-uffi-source-file)) - (let ((lib (make-pathname :defaults (component-pathname c) - :type (uffi:default-foreign-library-type)))) - (and (probe-file lib) - (> (file-write-date lib) (file-write-date (component-pathname c)))))) + (or (and (probe-file #p"/usr/lib/clsql/uffi.so") t) + (let ((lib (make-pathname :defaults (component-pathname c) + :type (uffi:default-foreign-library-type)))) + (and (probe-file lib) + (> (file-write-date lib) (file-write-date (component-pathname c))))))) #+(or allegro lispworks cmu sbcl openmcl mcl scl) (defsystem clsql-uffi @@ -86,7 +89,7 @@ :components ((:module :uffi :components - ((:clsql-uffi-source-file "uffi") - (:file "clsql-uffi-package") + ((:file "clsql-uffi-package") + (:clsql-uffi-source-file "uffi" :depends-on ("clsql-uffi-package")) (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package" "uffi")) (:file "clsql-uffi" :depends-on ("clsql-uffi-loader")))))) diff --git a/debian/changelog b/debian/changelog index e5364d5..584afe2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-sql (2.9.1-1) unstable; urgency=low + + * Fix shared library loading in .asd files (closes:245004) + + -- Kevin M. Rosenberg Tue, 20 Apr 2004 19:30:16 -0600 + cl-sql (2.9.0-1) unstable; urgency=low * New upstream -- 2.34.1