From 92978bcc8387f65acdd400a62adb07b7ca5b80aa Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Fri, 28 Jan 2005 23:29:36 +0000 Subject: [PATCH] r10287: more 64-bit loader improvments --- db-mysql/Makefile | 2 +- db-mysql/mysql-loader.lisp | 5 +---- uffi/clsql-uffi-loader.lisp | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/db-mysql/Makefile b/db-mysql/Makefile index 14721ce..70a2d18 100644 --- a/db-mysql/Makefile +++ b/db-mysql/Makefile @@ -26,7 +26,7 @@ shared_lib=$(base).so all: $(shared_lib) $(shared_lib): $(source) Makefile - CFLAGS="-I /usr/include/mysql -I /usr/local/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql" LDFLAGS="-L/usr/local/lib/mysql -L/usr/lib/mysql -L/sw/lib -L/opt/local/lib/mysql -lmysqlclient" BASE=$(base) OBJECT=$(object) SOURCE=$(source) SHARED_LIB=$(shared_lib) sh make.sh + CFLAGS="-I /usr/local/include/mysql -I /usr/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql" LDFLAGS="-L/usr/local/lib64/mysql -L/usr/lib/mysql -L/sw/lib -L/opt/local/lib/mysql -lmysqlclient" BASE=$(base) OBJECT=$(object) SOURCE=$(source) SHARED_LIB=$(shared_lib) sh make.sh rm $(object) .PHONY: distclean diff --git a/db-mysql/mysql-loader.lisp b/db-mysql/mysql-loader.lisp index b5d6b9f..ffcc576 100644 --- a/db-mysql/mysql-loader.lisp +++ b/db-mysql/mysql-loader.lisp @@ -31,11 +31,8 @@ (defparameter *mysql-library-candidate-directories* `(,(pathname-directory *load-pathname*) - "/opt/mysql/lib/mysql/" "/usr/local/lib/" #+(or 64bit x86-64) "/usr/lib64/" #+(or 64bit x86-64) "/usr/local/lib64/mysql/" - #+(or 64bit x86-64) "/usr/local/lib64/" - #+(or 64bit x86-64) "/usr/local/lib64/mysql/" - + "/opt/mysql/lib/mysql/" "/usr/local/lib/" "/usr/lib/" "/usr/local/lib/mysql/" "/usr/lib/mysql/" "/mysql/lib/opt/" "/sw/lib/mysql/" "/opt/local/lib/mysql/")) (defvar *mysql-library-candidate-drive-letters* '("C" "D" "E")) diff --git a/uffi/clsql-uffi-loader.lisp b/uffi/clsql-uffi-loader.lisp index 5306988..8b9efb7 100644 --- a/uffi/clsql-uffi-loader.lisp +++ b/uffi/clsql-uffi-loader.lisp @@ -20,7 +20,7 @@ (defvar *clsql-uffi-library-filename* (uffi:find-foreign-library - '(#+64bit "uffi64" "uffi") + '(#+(or 64bit x86-64) "uffi64" "uffi") `(,clsql-uffi-system::*library-file-dir* "/usr/lib/clsql/") :drive-letters '("C"))) -- 2.34.1