[skycat] 01/01: Configure shared libs for hurd-i386 and kfreeBSD-* correctly

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository skycat.

commit a974f8e3cc836ba3c454fdc8ca6bbbd28d54d6fd
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Sep 11 17:09:23 2013 +0200

    Configure shared libs for hurd-i386 and kfreeBSD-* correctly
---
 debian/changelog              |    6 ++++++
 debian/patches/nonlinux.patch |   47 +++++++++++++++++++++++++++++++++++++++++
 debian/patches/series         |    1 +
 3 files changed, 54 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6fc6fb8..cf5a42a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+skycat (3.1.2+starlink1~b-2) unstable; urgency=low
+
+  * Configure shared libs for hurd-i386 and kfreeBSD-* correctly.
+
+ -- Ole Streicher <debian at liska.ath.cx>  Wed, 11 Sep 2013 17:08:17 +0200
+
 skycat (3.1.2+starlink1~b-1) unstable; urgency=low
 
   * Initial release. (Closes: #719116)
diff --git a/debian/patches/nonlinux.patch b/debian/patches/nonlinux.patch
new file mode 100644
index 0000000..d0cef84
--- /dev/null
+++ b/debian/patches/nonlinux.patch
@@ -0,0 +1,47 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Configure shared libs for hurd-i386 and kfreeBSD-* correctly.
+--- a/tclconfig/tcl.m4
++++ b/tclconfig/tcl.m4
+@@ -1379,17 +1379,17 @@
+ 	    fi
+ 
+ 	    ;;
+-	GNU*)
++	GNU-*)
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_LD_LIBS='${LIBS}'
+ 	    SHLIB_SUFFIX=".so"
+ 
+ 	    if test "$have_dl" = yes; then
+ 		SHLIB_LD="${CXX} -shared"
+-		DL_OBJS=""
++		DL_OBJS="tclLoadDl.o"
+ 		DL_LIBS="-ldl"
+-		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+-		LD_SEARCH_FLAGS=""
++		LDFLAGS="$LDFLAGS -Wl,--export-dynamic -Wl,-soname,lib${PACKAGE_NAME}${PACKAGE_VERSION}.so"
++		LD_SEARCH_FLAGS='-Wl,-rpath,${libdir}'
+ 	    else
+ 		AC_CHECK_HEADER(dld.h, [
+ 		    SHLIB_LD="ld -shared"
+@@ -1481,16 +1481,16 @@
+ 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+ 	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+-	FreeBSD-*)
++	FreeBSD-*|GNU/kFreeBSD*)
+ 	    # FreeBSD 3.* and greater have ELF.
+ 	    SHLIB_CFLAGS="-fPIC"
+-	    SHLIB_LD="ld -Bshareable -x"
++	    SHLIB_LD="${CXX} -shared"
+ 	    SHLIB_LD_LIBS='${LIBS}'
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS=""
+-	    LDFLAGS="$LDFLAGS -export-dynamic"
+-	    LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
++	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic -Wl,-soname,lib${PACKAGE_NAME}${PACKAGE_VERSION}.so"
++	    LD_SEARCH_FLAGS='-Wl,-rpath,${libdir}'
+ 	    if test "${TCL_THREADS}" = "1" ; then
+ 		# The -pthread needs to go in the CFLAGS, not LIBS
+ 		LIBS=`echo $LIBS | sed s/-pthread//`
diff --git a/debian/patches/series b/debian/patches/series
index 729443d..97f83f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ fix_build_problems.patch
 use_std_blt.patch
 fhs.patch
 use_wcstools.patch
+nonlinux.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/skycat.git