r9094: freebsd changes

diff --git a/ChangeLog b/ChangeLog
index f96cb01adb30bd8d88549dd1cfd084808d863cf2..3b51f3cc408a6b596f34a0fc0771b8d4bf79bec0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+19 Apr 2004 Kevin Rosenberg (kevin@rosenberg.net)
+       * Version 2.8.2: Build changes for FreeBSD [Slawek Zak]
+
 19 Apr 2004 Kevin Rosenberg (kevin@rosenberg.net)
        * Version 2.8.1
        * db-odbc/odbc-sql.lisp: Add DATABASE-LIST function 

diff --git a/clsql-mysql.asd b/clsql-mysql.asd
index 62945386fdacf30519241d7c6cdf3f3ad25db810..72b961f0108b54e10a399d70ac3c4fc23e35075b 100644 (file)
--- a/clsql-mysql.asd
+++ b/clsql-mysql.asd
@@ -53,7 +53,8 @@
 (defmethod perform ((o compile-op) (c clsql-mysql-source-file))
   #-(or win32 mswindows)
   (unless (zerop (run-shell-command
-                 "cd ~A; make"
+                 #-freebsd "cd ~A; make"
+                 #+freebsd "cd ~A; gmake"
                  (namestring (make-pathname :name nil
                                             :type nil
                                             :directory *library-file-dir*))))

diff --git a/clsql-uffi.asd b/clsql-uffi.asd
index 64a20a96c97af11ad8a6ef5d81e68c7141c21136..49ae32d440e67789a9c628ef4920881755d6e97f 100644 (file)
--- a/clsql-uffi.asd
+++ b/clsql-uffi.asd
@@ -59,7 +59,8 @@
 (defmethod perform ((o compile-op) (c clsql-uffi-source-file))
   #-(or win32 mswindows)
   (unless (zerop (run-shell-command
-                 "cd ~A; make"
+                 #-freebsd "cd ~A; make"
+                 #+freebsd "cd ~A; gmake"
                  (namestring (make-pathname :name nil
                                             :type nil
                                             :directory *library-file-dir*))))

diff --git a/db-mysql/Makefile b/db-mysql/Makefile
index 7af100780be42ff40e34431369ed2e06cd4af2c1..2daceb6556ff046c65601cad6f9cf5f68985fc6a 100644 (file)
--- 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" LDFLAGS="-lmysqlclient" BASE=$(base) OBJECT=$(object) SOURCE=$(source) SHARED_LIB=$(shared_lib) sh make.sh
+       CFLAGS="-I /usr/include/mysql -I /usr/local/include/mysql" LDFLAGS="-L/usr/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/make.sh b/db-mysql/make.sh
index fbd124b5658c8c60a3d2dd51a2772c0105269fef..cb89204032d7407f679b84020f4dde7f45ec638b 100644 (file)
--- a/db-mysql/make.sh
+++ b/db-mysql/make.sh
@@ -2,6 +2,7 @@
 
 case "`uname`" in
     Linux) os_linux=1 ;;
+    FreeBSD) os_freebsd=1 ;;
     Darwin) os_darwin=1 ;;
     SunOS) os_sunos=1 ;;
     AIX) os_aix=1 ;;
@@ -9,10 +10,9 @@ case "`uname`" in
        exit 1 ;;       
 esac
     
-if [ "$os_linux" ]; then
+if [ "$os_linux" -o "$os_freebsd" ]; then
     gcc $CFLAGS -fPIC -c $SOURCE -o $OBJECT
     gcc -shared $OBJECT $LDFLAGS -o $SHARED_LIB
-
 elif [ "$os_darwin" ]; then
     cc $CFLAGS -dynamic -c $SOURCE -o $OBJECT
     ld -bundle /usr/lib/bundle1.o -flat_namespace -undefined suppress -o $BASE.dylib $OBJECT

diff --git a/uffi/make.sh b/uffi/make.sh
index ba59d82321738481c46ba55e7e885b1bcc218bc1..3b792ce781cbd9ba0ae388ff994cd531f08e6916 100644 (file)
--- a/uffi/make.sh
+++ b/uffi/make.sh
@@ -2,6 +2,7 @@
 
 case "`uname`" in
     Linux) os_linux=1 ;;
+    FreeBSD) os_freebsd=1 ;;
     Darwin) os_darwin=1 ;;
     SunOS) os_sunos=1 ;;
     AIX) os_aix=1 ;;
@@ -9,10 +10,9 @@ case "`uname`" in
        exit 1 ;;       
 esac
     
-if [ "$os_linux" ]; then
+if [ "$os_linux" -o "$os_freebsd" ]; then
     gcc -fPIC -DPIC -c $SOURCE -o $OBJECT
     gcc -shared $OBJECT -o $SHARED_LIB
-
 elif [ "$os_darwin" ]; then
     cc -dynamic -c $SOURCE -o $OBJECT
     ld -bundle /usr/lib/bundle1.o -flat_namespace -undefined suppress -o $BASE.dylib $OBJECT