From b746611f6d622273f1563d9d0f65b59b58714694 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Wed, 12 May 2004 20:25:42 +0000 Subject: [PATCH] r9325: * db-*/*-loader.lisp: Load 64-bit libraries on 64-bit platorms --- ChangeLog | 1 + db-odbc/odbc-loader.lisp | 1 + db-postgresql/postgresql-loader.lisp | 1 + db-sqlite/sqlite-loader.lisp | 3 ++- tests/test-init.lisp | 2 +- 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4a29be9..8a08005 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 11 May 2004 Kevin Rosenberg (kevin@rosenberg.net) * db-mysql/mysql-api.lisp: Fix int vs. long slots in foreign structures found by testing with AllegroCL 7.0b AMD64. + * db-*/*-loader.lisp: Load 64-bit libraries on 64-bit platorms * sql/objects.lisp: Initial caching support for SELECT * tests/test-oodml.lisp: Avoid using cache when testing select. * sql/kmr-mop.lisp: Explicitly check slot order and diff --git a/db-odbc/odbc-loader.lisp b/db-odbc/odbc-loader.lisp index 45bb6ff..94206d8 100644 --- a/db-odbc/odbc-loader.lisp +++ b/db-odbc/odbc-loader.lisp @@ -22,6 +22,7 @@ (uffi:find-foreign-library '("odbc32" "libodbc" "libiodbc") `(,(make-pathname :directory (pathname-directory *load-truename*)) + #+64bit "/usr/lib64/" "/usr/lib/" "/sw/lib/" "/usr/local/lib/" diff --git a/db-postgresql/postgresql-loader.lisp b/db-postgresql/postgresql-loader.lisp index 420c97a..169588f 100644 --- a/db-postgresql/postgresql-loader.lisp +++ b/db-postgresql/postgresql-loader.lisp @@ -36,6 +36,7 @@ set to the right path before compiling or loading the system.") (let ((libpath (uffi:find-foreign-library "libpq" '("/opt/postgresql/lib/" "/usr/local/lib/" + #+64bit "/usr/lib64/" "/usr/lib/" "/postgresql/lib/" "/usr/local/pgsql/lib/" "/usr/lib/pgsql/" "/opt/pgsql/lib/pgsql" "/sw/lib/pgsql/") diff --git a/db-sqlite/sqlite-loader.lisp b/db-sqlite/sqlite-loader.lisp index 1cfcf21..71e3385 100644 --- a/db-sqlite/sqlite-loader.lisp +++ b/db-sqlite/sqlite-loader.lisp @@ -37,7 +37,8 @@ set to the right path before compiling or loading the system.") #-clisp (let ((libpath (uffi:find-foreign-library "libsqlite" - '("/usr/lib/" "/usr/local/lib/") + '(#+64bit "/usr/lib64/" + "/usr/lib/" "/usr/local/lib/") :drive-letters '("C" "D" "E")))) (if (uffi:load-foreign-library libpath :module "sqlite" diff --git a/tests/test-init.lisp b/tests/test-init.lisp index ed94987..9cf50ff 100644 --- a/tests/test-init.lisp +++ b/tests/test-init.lisp @@ -16,7 +16,7 @@ (in-package #:clsql-tests) -(defvar *report-stream* nil "Stream to send text report.") +(defvar *report-stream* *standard-output* "Stream to send text report.") (defvar *sexp-report-stream* nil "Stream to send sexp report.") (defvar *rt-connection*) (defvar *rt-fddl*) -- 2.34.1