Hello
The attached patch (against 0.6.0) does two things:
* changes the default locations of the db4.3 on linux to what I guess
should match what most users have and the filesystem hierarchy standard
* guards against loading the pthreads library on threaded sbcl where the
right version is already loaded and it crashes sbcl
Cheers, Gabor Melis
diff -ru elephant-0.6.0/Makefile elephant-0.6.0.new/Makefile
--- elephant-0.6.0/Makefile 2006-02-19 18:25:52.000000000 +0100
+++ elephant-0.6.0.new/Makefile 2007-01-07 15:59:19.000000000 +0100
@@ -32,7 +32,7 @@
#
# But I will assume that Linux is more common?
-DB43DIR=/usr/local/BerkeleyDB.4.3/
+DB43DIR=/usr/
# Dan Knapp contributed this line, which came form OS X?
# DB43DIR=/sw
# Other example paths
diff -ru elephant-0.6.0/config.lisp elephant-0.6.0.new/config.lisp
--- elephant-0.6.0/config.lisp 2006-04-30 03:03:48.000000000 +0200
+++ elephant-0.6.0.new/config.lisp 2007-01-07 16:06:53.000000000 +0100
@@ -28,7 +28,7 @@
;; Sleepycat: this works on linux
#+linux
;; "/db/ben/lisp/db43/lib/libdb.so"
- "/usr/local/BerkeleyDB.4.3/lib/libdb-4.3.so"
+ "/usr/lib/libdb-4.3.so"
;; this works on FreeBSD
#+(and (or bsd freebsd) (not (or darwin macosx)))
"/usr/local/lib/db43/libdb.so"
diff -ru elephant-0.6.0/src/db-bdb/sleepycat.lisp elephant-0.6.0.new/src/db-bdb/sleepycat.lisp
--- elephant-0.6.0/src/db-bdb/sleepycat.lisp 2006-04-30 03:03:49.000000000 +0200
+++ elephant-0.6.0.new/src/db-bdb/sleepycat.lisp 2007-01-20 19:15:19.000000000 +0100
@@ -55,7 +55,7 @@
;; Under Linux we need pthreads!
;;
- #+linux
+ #+(and linux (not sb-thread))
(unless
(uffi:load-foreign-library
elephant::*sleepycat-pthreads-path*
_______________________________________________
elephant-devel site list
elephant-devel@common-lisp.net
http://common-lisp.net/mailman/listinfo/elephant-devel
