r10899: Automated commit for Debian build of clsql upstream-version-3.5.5

[clsql.git] / clsql-uffi.asd

diff --git a/clsql-uffi.asd b/clsql-uffi.asd
index fb22dc102d996c749875bb1672f33df1a149bc2a..48372a1cff433b5060ae08a564e0f355c5108045 100644 (file)
--- a/clsql-uffi.asd
+++ b/clsql-uffi.asd
@@ -18,11 +18,6 @@
 
 (in-package cl-user)
 
-;; need to load uffi for below output-files method 
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  #+common-lisp-controller (require 'uffi)
-  #-common-lisp-controller (asdf:operate 'asdf:load-op 'uffi))
-
 (defpackage clsql-uffi-system (:use #:asdf #:cl))
 (in-package clsql-uffi-system)
 
@@ -59,23 +54,24 @@
        t))
 
 (defmethod perform ((o compile-op) (c clsql-uffi-source-file))
-  #-(or win32 mswindows)
-  (unless (zerop (run-shell-command
-                 #-freebsd "cd ~A; make"
-                 #+freebsd "cd ~A; gmake"
-                 (namestring (make-pathname :name nil
-                                            :type nil
-                                            :directory *library-file-dir*))))
-    (error 'operation-error :component c :operation o)))
+  (unless (operation-done-p o c)
+    #-(or win32 mswindows)
+    (unless (zerop (run-shell-command
+                   #-freebsd "cd ~A; make"
+                   #+freebsd "cd ~A; gmake"
+                   (namestring (make-pathname :name nil
+                                              :type nil
+                                              :directory *library-file-dir*))))
+      (error 'operation-error :component c :operation o))))
 
 (defmethod operation-done-p ((o compile-op) (c clsql-uffi-source-file))
-  (or (and (probe-file #p"/usr/lib/clsql/uffi.so") t)
+  (or (and (probe-file #p"/usr/lib/clsql/clsql_uffi.so") t)
       (let ((lib (make-pathname :defaults (component-pathname c)
-                               :type (uffi:default-foreign-library-type))))
-       (and (probe-file lib)
+                               :type (funcall (intern (symbol-name '#:default-foreign-library-type)
+                                                       (find-package '#:uffi))))))
+       (and (probe-file lib) (probe-file (component-pathname c))
             (> (file-write-date lib) (file-write-date (component-pathname c)))))))
   
-#+(or allegro lispworks cmu sbcl openmcl mcl scl)
 (defsystem clsql-uffi
   :name "cl-sql-base"
   :author "Kevin M. Rosenberg <kmr@debian.org>"
@@ -84,12 +80,12 @@
   :description "Common UFFI Helper functions for Common Lisp SQL Interface Library"
   :long-description "cl-sql-uffi package provides common helper functions using the UFFI for the CLSQL package."
 
-  :depends-on (uffi clsql-base)
+  :depends-on (uffi clsql)
   
   :components
   ((:module :uffi
            :components
            ((:file "clsql-uffi-package")
-            (:clsql-uffi-source-file "uffi" :depends-on ("clsql-uffi-package"))
-            (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package" "uffi"))
+            (:clsql-uffi-source-file "clsql_uffi" :depends-on ("clsql-uffi-package"))
+            (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package" "clsql_uffi"))
             (:file "clsql-uffi" :depends-on ("clsql-uffi-loader"))))))