From 614e68954c499aa0424c70245b4b33c8b5ba8687 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Mon, 19 Apr 2004 11:28:29 +0000 Subject: [PATCH] r9094: freebsd changes --- ChangeLog | 3 +++ clsql-mysql.asd | 3 ++- clsql-uffi.asd | 3 ++- db-mysql/Makefile | 2 +- db-mysql/make.sh | 4 ++-- uffi/make.sh | 4 ++-- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index f96cb01..3b51f3c 100644 --- 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 6294538..72b961f 100644 --- 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 64a20a9..49ae32d 100644 --- 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 7af1007..2daceb6 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" 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 fbd124b..cb89204 100644 --- 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 ba59d82..3b792ce 100644 --- 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 -- 2.34.1