r10592: add debian patch
authorKevin M. Rosenberg <kevin@rosenberg.net>
Wed, 8 Jun 2005 23:37:11 +0000 (23:37 +0000)
committerKevin M. Rosenberg <kevin@rosenberg.net>
Wed, 8 Jun 2005 23:37:11 +0000 (23:37 +0000)
debian/_patch_orig_ [new file with mode: 0644]

diff --git a/debian/_patch_orig_ b/debian/_patch_orig_
new file mode 100644 (file)
index 0000000..32be466
--- /dev/null
@@ -0,0 +1,38 @@
+diff -ur clsql/db-mysql/mysql-loader.lisp clsql-debian/db-mysql/mysql-loader.lisp
+--- clsql/db-mysql/mysql-loader.lisp   2005-06-08 13:21:08.816849000 -0600
++++ clsql-debian/db-mysql/mysql-loader.lisp    2005-06-08 17:33:33.547500816 -0600
+@@ -41,9 +41,11 @@
+   *mysql-library-loaded*)
+                                     
+ (defmethod clsql-sys:database-type-load-foreign ((database-type (eql :mysql)))
+-  (clsql-uffi:find-and-load-foreign-library *mysql-library-candidate-names*
+-                                            :module "mysql" 
+-                                            :supporting-libraries *mysql-supporting-libraries*)
++  (if (probe-file #p"/usr/lib/clsql/clsql_mysql.so")
++      (uffi:load-foriegn-library #p"/usr/lib/clsql/clsql_mysql.so")
++      (clsql-uffi:find-and-load-foreign-library *mysql-library-candidate-names*
++                                              :module "mysql" 
++                                              :supporting-libraries *mysql-supporting-libraries*))
+   (clsql-uffi:find-and-load-foreign-library *clsql-mysql-library-candidate-names*
+                                             :module "clsql-mysql" 
+                                             :supporting-libraries *mysql-supporting-libraries*)
+diff -ur clsql/uffi/clsql-uffi-loader.lisp clsql-debian/uffi/clsql-uffi-loader.lisp
+--- clsql/uffi/clsql-uffi-loader.lisp  2005-06-08 13:25:29.006295000 -0600
++++ clsql-debian/uffi/clsql-uffi-loader.lisp   2005-06-08 17:34:29.748956896 -0600
+@@ -51,10 +51,12 @@
+   "T if foreign library was able to be loaded successfully")
+ (defun load-uffi-foreign-library ()
+-  (find-and-load-foreign-library *clsql-uffi-library-filenames*
+-                                 :module "clsql-uffi" 
+-                                 :supporting-libraries 
+-                                 *clsql-uffi-supporting-libraries*)
++  (if (probe-file #p"/usr/lib/clsql/clsql_uffi.so")
++      (uffi:load-foriegn-library #p"/usr/lib/clsql/clsql_uffi.so")
++      (find-and-load-foreign-library *clsql-uffi-library-filenames*
++                                   :module "clsql-uffi" 
++                                   :supporting-libraries 
++                                   *clsql-uffi-supporting-libraries*))
+   (setq *uffi-library-loaded* t))
+ (load-uffi-foreign-library)