r10581: Automated commit for Debian build of clsql upstream-version-3.1.17

diff --git a/db-mysql/make.sh b/db-mysql/make.sh
index cb89204032d7407f679b84020f4dde7f45ec638b..c5c60059df9fca4fd0322da7776b422442895b6e 100644 (file)
--- a/db-mysql/make.sh
+++ b/db-mysql/make.sh
@@ -12,7 +12,7 @@ esac
     
 if [ "$os_linux" -o "$os_freebsd" ]; then
     gcc $CFLAGS -fPIC -c $SOURCE -o $OBJECT
-    gcc -shared $OBJECT $LDFLAGS -o $SHARED_LIB
+    ld -shared -soname=$BASE  $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/debian/rules b/debian/rules
index 6604df99f8bd2c135e37331700cc3d11b80addf7..29ba2ef1c502296f5a9d50a83696029746dcaea2 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -21,9 +21,9 @@ UPSTREAM_VER  := $(shell sed -n -e "s/${pkg} (\(.*\)-[0-9A-Za-z\.]).*/\1/p" < deb
 ## Lisp sources
 srcs           := $(wildcard sql/*.lisp) clsql.asd
 srcs-uffi      := $(wildcard uffi/*.lisp) $(wildcard uffi/*.c)
-srcs-uffi-so   = $(wildcard uffi/*.so)
+srcs-uffi-so   = $(wildcard uffi/*.so.1)
 srcs-mysql     := $(wildcard db-mysql/*.lisp) $(wildcard db-mysql/*.c)
-srcs-mysql-so  =  $(wildcard db-mysql/*.so)
+srcs-mysql-so  =  $(wildcard db-mysql/*.so.1)
 srcs-pg                := $(wildcard db-postgresql/*.lisp)
 srcs-pg-socket := $(wildcard db-postgresql-socket/*.lisp)
 srcs-aodbc     := $(wildcard db-aodbc/*.lisp)
@@ -77,6 +77,8 @@ build-arch-stamp:
        dh_testdir
        # Add here commands to compile the package.
        $(MAKE)
+       mv uffi/clsql_uffi.so uffi/clsql_uffi.so.1
+       mv db-mysql/clsql_mysql.so db-mysql/clsql_mysql.so.1
        touch build-arch-stamp
 
 build-indep: configure-stamp  build-indep-stamp
@@ -209,6 +211,7 @@ binary-indep: build install
        dh_link -i
        dh_compress -i
        dh_fixperms -i
+       dh_makeshlibs -i
        dh_installdeb -i
 #      dh_perl -i
        dh_gencontrol -i
@@ -237,7 +240,7 @@ binary-arch: build install
        dh_link -a
        dh_compress -a
        dh_fixperms -a
-#      dh_makeshlibs -a
+#      dh_makeslhibs -a
        dh_installdeb -a
 #      dh_perl -a
        dh_shlibdeps -a

diff --git a/uffi/make.sh b/uffi/make.sh
index 3b792ce781cbd9ba0ae388ff994cd531f08e6916..3a47327869ba6e214e440959b3a5a3c9b2c061d3 100644 (file)
--- a/uffi/make.sh
+++ b/uffi/make.sh
@@ -12,7 +12,7 @@ esac
     
 if [ "$os_linux" -o "$os_freebsd" ]; then
     gcc -fPIC -DPIC -c $SOURCE -o $OBJECT
-    gcc -shared $OBJECT -o $SHARED_LIB
+    ld -shared -soname=$BASE $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