X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/fd9d29a449e84fa05ba66bcbc72d37269a649668..89db7367efd30fe7eaea92c5093c8d9d69a25400:/tools/asdf-extensions.lisp

diff --git a/tools/asdf-extensions.lisp b/tools/asdf-extensions.lisp
index 75918f7..93be2d3 100644
--- a/tools/asdf-extensions.lisp
+++ b/tools/asdf-extensions.lisp
@@ -51,10 +51,16 @@
 			      (module-components dso)))))
       (error 'operation-error :operation operation :component dso))))
 
+#+clisp
+(defvar *loaded-libraries* ())
 
 (defun load-dso (filename)
   #+sbcl(sb-alien:load-shared-object filename)
-  #+cmu(system::load-object-file filename))
+  #+cmu(ext:load-foreign filename)
+  #+clisp
+  (unless (find filename *loaded-libraries* :test #'equal)
+    (ffi::foreign-library (namestring filename))
+    (push filename *loaded-libraries*)))
 
 
 (defmethod perform ((o load-op) (c unix-dso))
@@ -106,17 +112,22 @@
   ((libdir :initarg :libdir)))
 
 
-(defun relative-pathname (path)
-  (etypecase path
-    (cons path)
-    (string (if (char= #\/ (char path 0))
-		(subseq path 1)
-	      path))))
+(defun split-path (path)
+  (labels ((split (path)
+	     (unless (zerop (length path))
+	       (let ((slash (position #\/ path)))
+		 (if slash
+		     (cons (subseq path 0 slash) (split (subseq path (1+ slash))))
+		   (list path))))))
+    (if (and (not (zerop (length path))) (char= (char path 0) #\/))
+	(cons :absolute (split (subseq path 1)))
+      (cons :relative (split path)))))
+
 
 (defmethod component-pathname ((lib library))
   (make-pathname :type "so"
 		 :name (component-name lib)
-		 :directory (relative-pathname (slot-value lib 'libdir))))
+		 :directory (split-path (slot-value lib 'libdir))))
 
 (defmethod perform ((o load-op) (c library))
   (load-dso (component-pathname c)))
@@ -130,7 +141,8 @@
 	system::*global-table* 
 	:key #'(lambda (pathname)
 		 (when pathname (unix::unix-namestring pathname)))
-	:test #'equal))
+	:test #'equal)
+  #+clisp(find (component-pathname c) *loaded-libraries* :test #'equal))
 
 (defmethod operation-done-p ((o operation) (c library))
   t)