summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
22f792c)
* makefile.common: Check for /usr/bin/dpkg-buildflags
* {db-mysql,uffi}/Makefile: Use debian buildflags
+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.
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
.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
- 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
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)
+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
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
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
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)
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)