Version 6.5.0 Release

	* makefile.common: Check for /usr/bin/dpkg-buildflags
	* {db-mysql,uffi}/Makefile: Use debian buildflags

diff --git a/ChangeLog b/ChangeLog
index 61d09c15df90cc8b0973b9ad64b822addc81b6ed..842aa271f1a153eda3f1ae62016b624fcae2db5c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-04  Kevin Rosenberg <kevin@rosenberg.net>
+       * Version 6.5.0: New release
+       * makefile.common: Check for /usr/bin/dpkg-buildflags
+       * {db-mysql,uffi}/Makefile: Use debian buildflags
+

 2014-02-24 Russ Tyndall <russ@acceleration.net>
        * oodml.lisp bind *print-length* to nil before printing
        lists/arrays to the database.
 2014-02-24 Russ Tyndall <russ@acceleration.net>
        * oodml.lisp bind *print-length* to nil before printing
        lists/arrays to the database.

diff --git a/Makefile.common b/Makefile.common
index 3c8fd2bb314b131a79943c066a7355adcb493d7f..358d75d1cf33976fea7eee08b7f4c0c8c7af565e 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -13,6 +13,11 @@ endif
 OS_CYGWIN=$(shell expr "$(UNAME)" : '.*CYGWIN.*')
 OS_LINUX=$(shell expr "$(UNAME)" : '.*Linux.*')
 OS_LINUX64=$(shell expr "$(UNAME_A)" : '.*Linux.*x86_64.*')
 OS_CYGWIN=$(shell expr "$(UNAME)" : '.*CYGWIN.*')
 OS_LINUX=$(shell expr "$(UNAME)" : '.*Linux.*')
 OS_LINUX64=$(shell expr "$(UNAME_A)" : '.*Linux.*x86_64.*')

+ifneq ("$(wildcard /usr/bin/dpkg-buildflags)","")
+DPKG_BUILDFLAGS=1
+else
+DPKG_BUILDFLAGS=0
+endif

 
 all:
        
 
 all:
        

diff --git a/db-mysql/Makefile b/db-mysql/Makefile
index bbe489a1129e090126d86b41caaa0d23943457c7..3a497c1662dedcc6d470706be9d47c273ca44cd6 100644 (file)
--- a/db-mysql/Makefile
+++ b/db-mysql/Makefile
@@ -26,15 +26,19 @@ dylib=$(base).dylib
 .PHONY: all
 all: $(shared_lib)
 
 .PHONY: all
 all: $(shared_lib)
 

-CFLAGS=-I /usr/local/include/mysql -I /usr/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql -I /opt/local/include/mysql55/mysql -I /usr/local/mysql/include
-LDFLAGS=-L/usr/local/lib64/mysql -L/usr/local/lib/mysql -L/usr/lib64/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
+CFLAGS:=-I /usr/local/include/mysql -I /usr/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql -I /opt/local/include/mysql55/mysql -I /usr/local/mysql/include
+LDFLAGS:=-L/usr/local/lib64/mysql -L/usr/local/lib/mysql -L/usr/lib64/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
+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)
 
 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
+  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
+endif
+ifneq ($(OS_DPKG_BUILDFLAGS),0)
+  CFLAGS:=$(CFLAGS) $(shell dpkg-buildflags --get CFLAGS)
+  LDFLAGS:=$(LDFLAGS) $(shell dpkg-buildflags --get LDFLAGS | sed "/-Wl,\(.*\)/ s//\1/")

 endif
 
 $(shared_lib): $(source) Makefile
 endif
 
 $(shared_lib): $(source) Makefile


@@ -60,7 +64,7 @@ else
         else
           ifneq ($(OS_LINUX64),0)
            gcc $(CFLAGS) -fPIC -c $(source) -o $(object)
         else
           ifneq ($(OS_LINUX64),0)
            gcc $(CFLAGS) -fPIC -c $(source) -o $(object)

-           ld -shared -soname=$(base) $(object) $(LDFLAGS) -o $(shared64_lib)
+           ld $(LDFLAGS) -shared -soname=$(base) $(object) -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)
            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)

diff --git a/debian/changelog b/debian/changelog
index bb6a915a40c589a8197fe8309fe583b491634ac4..7a72023c350422063a9423d65a1343427537b03a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-sql (6.5.0-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Tue, 04 Mar 2014 10:10:27 -0700
+

 cl-sql (6.4.1-1) unstable; urgency=low
 
   * New upstream
 cl-sql (6.4.1-1) unstable; urgency=low
 
   * New upstream

diff --git a/debian/control b/debian/control
index 603f1d8ca4304769df32dea6f579d28dbed29c3d..da7533aa0a52a46246be455b0931bd3cc7784198 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: lisp
 Priority: extra
 Maintainer: Kevin M. Rosenberg <kmr@debian.org>
 Build-Depends: dh-lisp, debhelper (>= 7.0.0), libmysqlclient-dev, libpq-dev
 Priority: extra
 Maintainer: Kevin M. Rosenberg <kmr@debian.org>
 Build-Depends: dh-lisp, debhelper (>= 7.0.0), libmysqlclient-dev, libpq-dev

-Standards-Version: 3.9.4.0
+Standards-Version: 3.9.5.0

 Homepage: http://clsql.b9.com/
 Vcs-Git: git://git.b9.com/clsql.git
 Vcs-Browser: http://git.b9.com/?p=clsql.git
 Homepage: http://clsql.b9.com/
 Vcs-Git: git://git.b9.com/clsql.git
 Vcs-Browser: http://git.b9.com/?p=clsql.git

diff --git a/debian/rules b/debian/rules
index b48c3aedac591568468f4e5ee6792145192fb247..74d450051afb07ddc0116befc80c58b0294b4efa 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -69,7 +69,6 @@ lispdir-tests := $(clc-tests)/tests
 build-arch: build-arch-stamp
 build-arch-stamp:
        dh_testdir
 build-arch: build-arch-stamp
 build-arch-stamp:
        dh_testdir

-       # env LDFLAGS=`pkg-buildflags --get LDFLAGS` $(MAKE)

        $(MAKE)
        touch build-arch-stamp
 
        $(MAKE)
        touch build-arch-stamp
 

diff --git a/doc/clsql.pdf b/doc/clsql.pdf
index ee1c72301f77d1f10226b0d38dc0769a2995817a..4a5cc4ce611dfb3e506d2244c757cd4b6d95bfb2 100644 (file)
Binary files a/doc/clsql.pdf and b/doc/clsql.pdf differ

diff --git a/doc/html.tar.gz b/doc/html.tar.gz
index 35724e84578a99237fa4ef6a032683f35d7d0bff..bdc07349140a8ab6ee850c1130019bae93326e99 100644 (file)
Binary files a/doc/html.tar.gz and b/doc/html.tar.gz differ

diff --git a/uffi/Makefile b/uffi/Makefile
index b24f37603a49f73be9c53a631f37938417192a74..6f4467ac25f7bffccb185f7e03fb48d6a87e2d69 100644 (file)
--- a/uffi/Makefile
+++ b/uffi/Makefile
@@ -23,6 +23,12 @@ shared_lib=$(base).so
 shared64_lib=$(base)64.so
 dylib=$(base).dylib
 
 shared64_lib=$(base)64.so
 dylib=$(base).dylib
 

+ifneq ($(OS_DPKG_BUILDFLAGS),0)
+  CFLAGS:=$(CFLAGS) $(shell dpkg-buildflags --get CFLAGS)
+  LDFLAGS:=$(LDFLAGS) $(shell dpkg-buildflags --get LDFLAGS | sed "/-Wl,\(.*\)/ s//\1/")
+endif
+
+

 .PHONY: all
 all: $(shared_lib)
 
 .PHONY: all
 all: $(shared_lib)
 


@@ -48,12 +54,12 @@ else
          ld -shared -soname=$(base) $(LDFLAGS) $(object) -o $(shared_lib)
         else
           ifneq ($(OS_LINUX64),0)
          ld -shared -soname=$(base) $(LDFLAGS) $(object) -o $(shared_lib)
         else
           ifneq ($(OS_LINUX64),0)

-           gcc -fPIC -DPIC -c $(source) -o $(object)
-           ld -shared -soname=$(base) -lc $(object) -o $(shared64_lib)
+           gcc $(CFLAGS) -fPIC -DPIC -c $(source) -o $(object)
+           ld $(LDFLAGS) -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"
            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)
+           -gcc -m32 $(CFLAGS) -fPIC -DPIC -c $(source) -o $(object)
+           -ld -melf_i386 $(LDFLAGS) -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)
           else
            gcc -fPIC -DPIC -c $(source) -o $(object)
            ld -shared -soname=$(base) -lc $(object) -o $(shared_lib)