From ff21416cb3ac30f1d735593b08c3311964854070 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Wed, 8 Jun 2005 19:38:27 +0000 Subject: [PATCH] r10579: Automated commit for Debian build of clsql upstream-version-3.1.17 --- ChangeLog | 13 ++++++++----- clsql-mysql.asd | 2 +- clsql-uffi.asd | 4 ++-- debian/rules | 4 ++-- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 42b193d..288776d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,14 @@ 09 Jun 2005 Kevin Rosenberg - * clsql-mysql.asd: Renamed uffi/mysql interface library from - mysql to uffi_mysql - * db-mysql/uffi_mysql.c: Renamed from mysql.c - * db-mysql/Makefile, db-mysql/mysql-loader.lisp: Rename shared library + * clsql-mysql.asd: Renamed clsql/mysql interface library from + mysql to clsql_mysql + * clsql-uffi.asd: Renamed clsql/uffi interface library from + mysql to clsql_uffi + * uffi/clsql_uffi.c: Renamed from uffi.c + * db-mysql/clsql_mysql.c: Renamed from mysql.c + * db-mysql/Makefile, db-mysql/Makefile.msvc, db-mysql/mysql-loader.lisp: Rename shared library + * uffi/Makefile, uffi/Makefile.msvc, uffi/uffi-loader.lisp: Rename shared library * db-*/*-loader.lisp: Commit big patch from Edi Weitz to remove absolute pathnames when searching for foreign libraries. - * uffi/clsql-uffi-loader: New file from Edi Weitz for support foreign library loading. 07 Jun 2005 Kevin Rosenberg diff --git a/clsql-mysql.asd b/clsql-mysql.asd index 0ac546d..675a2ac 100644 --- a/clsql-mysql.asd +++ b/clsql-mysql.asd @@ -64,7 +64,7 @@ (error 'operation-error :component c :operation o)))) (defmethod operation-done-p ((o compile-op) (c clsql-mysql-source-file)) - (or (and (probe-file #p"/usr/lib/clsql/clsql_mysql.so") t) + (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) (probe-file (component-pathname c)) diff --git a/clsql-uffi.asd b/clsql-uffi.asd index ad9f93f..d7d4ac6 100644 --- a/clsql-uffi.asd +++ b/clsql-uffi.asd @@ -70,10 +70,10 @@ (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_uffi.so") t) (let ((lib (make-pathname :defaults (component-pathname c) :type (uffi:default-foreign-library-type)))) - (and (probe-file lib) + (and (probe-file lib) (probe-file (component-pathname c)) (> (file-write-date lib) (file-write-date (component-pathname c))))))) (defsystem clsql-uffi diff --git a/debian/rules b/debian/rules index 49f81f7..6604df9 100755 --- a/debian/rules +++ b/debian/rules @@ -44,10 +44,10 @@ clc-sql := $(clc-source)/clsql lispdir-sql := $(clc-sql)/sql clc-uffi := $(clc-source)/clsql-uffi lispdir-uffi := $(clc-uffi)/uffi -sodir-uffi := usr/lib/clsql +sodir-uffi := usr/lib clc-mysql := $(clc-source)/clsql-mysql lispdir-mysql := $(clc-mysql)/db-mysql -sodir-mysql := usr/lib/clsql +sodir-mysql := usr/lib clc-pg := $(clc-source)/clsql-postgresql lispdir-pg := $(clc-pg)/db-postgresql clc-pg-socket := $(clc-source)/clsql-postgresql-socket -- 2.34.1