From d2666f7b4a5bf839ad5749394498e4265249fd04 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Wed, 8 Jun 2005 20:07:54 +0000 Subject: [PATCH] r10581: Automated commit for Debian build of clsql upstream-version-3.1.17 --- db-mysql/make.sh | 2 +- debian/rules | 9 ++++++--- uffi/make.sh | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/db-mysql/make.sh b/db-mysql/make.sh index cb89204..c5c6005 100644 --- 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 6604df9..29ba2ef 100755 --- 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 3b792ce..3a47327 100644 --- 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 -- 2.34.1