r9116: Automated commit for Debian build of clsql upstream-version-2.9.1

diff --git a/clsql-mysql.asd b/clsql-mysql.asd
index 72b961f0108b54e10a399d70ac3c4fc23e35075b..7c77bab35f076f71dcd43646afa3c44cfb5575fa 100644 (file)
--- 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 49ae32d440e67789a9c628ef4920881755d6e97f..fb22dc102d996c749875bb1672f33df1a149bc2a 100644 (file)
--- 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 e5364d5ea0c1630a26b503e67f1d5e8030f400df..584afe2a7d2c8341bde081ddeee6b58dbea301cb 100644 (file)
--- 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 <kmr@debian.org>  Tue, 20 Apr 2004 19:30:16 -0600
+
 cl-sql (2.9.0-1) unstable; urgency=low
 
   * New upstream