+21 Nov 2009 Kevin Rosenberg <kevin@rosenberg.net>
+ * Version 4.1.2
+ * Makefiles: On 64-bit Linux systems, try to build both 32 and 64-bit
+ interface libraries. This requires the installation of multiarch build tools
+ as well as 32-bit support libraries (libc, libz and libmysqlclient).
+
04 Sep 2009 Kevin Rosenberg <kevin@rosenberg.net>
* Version 4.1.1
* sql/fdml.lisp: Rework do-query to use supplied database
UNAME=$(shell uname)
+UNAME_A=$(shell uname -a)
OS_AIX=$(shell expr "$(UNAME)" : '.*AIX.*')
OS_SUNOS=$(shell expr "$(UNAME)" : '.*SunOS.*')
OS_DARWIN=$(shell expr "$(UNAME)" : '.*Darwin.*')
OS_CYGWIN=$(shell expr "$(UNAME)" : '.*CYGWIN.*')
+OS_LINUX=$(shell expr "$(UNAME)" : '.*Linux.*')
+OS_LINUX64=$(shell expr "$(UNAME_A)" : '.*Linux.*x86_64.*')
all:
# Programer: Kevin M. Rosenberg
# Date Started: Mar 2002
#
-# CVS Id: $Id$
-#
# This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
#
# CLSQL users are granted the rights to distribute and use this software
source=$(base).c
object=$(base).o
shared_lib=$(base).so
+shared64_lib=$(base)64.so
.PHONY: all
CFLAGS=-I /usr/local/include/mysql -I /usr/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql -I /opt/local/include/mysql5/mysql -I /usr/local/mysql/include
LDFLAGS=-L/usr/local/lib64/mysql -L/usr/local/mysql/lib32 -L/usr/local/lib/mysql -L/usr/lib/mysql -L/sw/lib -L/opt/local/lib/mysql -L/opt/local/lib/mysql5/mysql -L/usr/local/mysql/lib -L/usr/lib/gcc/i686-pc-cygwin/3.4.4 -lmysqlclient -lz -lc
+CFLAGS32=-I /usr/local/include/mysql -I /usr/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql -I /opt/local/include/mysql5/mysql -I /usr/local/mysql/include -m32
+LDFLAGS32=-L/lib32 -L/usr/lib32 -melf_i386 -lmysqlclient -lz -lc
+
ifneq ($(OS_CYGWIN),0)
CFLAGS=-I /cygdrive/c/Program\ Files/MySQL/MySQL\ Server\ 5.0/include
LDFLAGS=-L/usr/local/lib64/mysql -L/usr/local/lib/mysql -L/usr/lib/mysql -L/sw/lib -L/opt/local/lib/mysql -L/usr/lib/gcc/i686-pc-cygwin/3.4.4 -lmysqlclient -lpthread -lz -lm -lgcc -lc
gcc $(CFLAGS) -DWIN32 -c $(source) -o $(object)
ld -shared -soname=$(base) $(object) $(LDFLAGS) -o $(shared_lib)
else
- gcc $(CFLAGS) -fPIC -c $(source) -o $(object)
- ld -shared -soname=$(base) $(object) $(LDFLAGS) -o $(shared_lib)
+ ifneq ($(OS_LINUX64),0)
+ gcc $(CFLAGS) -fPIC -c $(source) -o $(object)
+ ld -shared -soname=$(base) $(object) $(LDFLAGS) -o $(shared64_lib)
+ rm $(object)
+ @echo "Ensure that you have multiarch i386 build tools and libraries if you want to build 32-bit library"
+ gcc $(CFLAGS32) -fPIC -c $(source) -o $(object)
+ ld -shared -soname=$(base) $(object) $(LDFLAGS32) -o $(shared_lib)
+ else
+ gcc $(CFLAGS) -fPIC -c $(source) -o $(object)
+ ld -shared -soname=$(base) $(object) $(LDFLAGS) -o $(shared_lib)
+ endif
endif
endif
endif
+cl-sql (4.1.2-1) unstable; urgency=low
+
+ * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org> Thu, 12 Nov 2009 00:41:04 -0700
+
cl-sql (4.1.1-1) unstable; urgency=low
* New upstream
# Programer: Kevin M. Rosenberg
# Date Started: Mar 2002
#
-# CVS Id: $Id$
-#
# This file, part of CLSQL, is Copyright (c) 2002-2006 by Kevin M. Rosenberg
#
# CLSQL users are granted the rights to distribute and use this software
source=$(base).c
object=$(base).o
shared_lib=$(base).so
+shared64_lib=$(base)64.so
.PHONY: all
all: $(shared_lib)
gcc -c $(source) -o $(object)
ld -shared -soname=$(base) $(LDFLAGS) $(object) -o $(shared_lib)
else
- gcc -fPIC -DPIC -c $(source) -o $(object)
- ld -shared -soname=$(base) -lc $(object) -o $(shared_lib)
+ ifneq ($(OS_LINUX64),0)
+ gcc -fPIC -DPIC -c $(source) -o $(object)
+ ld -shared -soname=$(base) -lc $(object) -o $(shared64_lib)
+ rm -f $(object)
+ @echo "Ensure that you have multiarch i386 build tools if you want to build 32-bit library"
+ gcc -m32 -fPIC -DPIC -c $(source) -o $(object)
+ ld -melf_i386 -shared -soname=$(base) -lc $(object) -o $(shared_lib)
+ else
+ gcc -fPIC -DPIC -c $(source) -o $(object)
+ ld -shared -soname=$(base) -lc $(object) -o $(shared_lib)
+ endif
endif
endif
endif
.PHONY: distclean
distclean: clean
rm -f $(base).dylib $(base).dylib $(base).so $(base).o
-
-
-
-