[Pkg-bluetooth-commits] r663 - in /packages/bluez-libs/trunk/debian: changelog patches/ patches/003_configure_amd64_rpath.patch rules

[filippo at users.alioth.debian.org]

Author: filippo
Date: Thu Jan 17 18:16:46 2008
New Revision: 663

URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=663
Log:
* Add patch to configure for avoiding rpath on amd64

Added:
    packages/bluez-libs/trunk/debian/patches/
    packages/bluez-libs/trunk/debian/patches/003_configure_amd64_rpath.patch
Modified:
    packages/bluez-libs/trunk/debian/changelog
    packages/bluez-libs/trunk/debian/rules

Modified: packages/bluez-libs/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-libs/trunk/debian/changelog?rev=663&op=diff
==============================================================================
--- packages/bluez-libs/trunk/debian/changelog (original)
+++ packages/bluez-libs/trunk/debian/changelog Thu Jan 17 18:16:46 2008
@@ -2,8 +2,9 @@
 
   * Update homepage/vcs fields in control
   * Bump standards-version
-
- -- Filippo Giunchedi <filippo at debian.org>  Mon, 31 Dec 2007 11:57:31 +0100
+  * Add patch to configure for avoiding rpath on amd64
+
+ -- Filippo Giunchedi <filippo at debian.org>  Thu, 17 Jan 2008 10:06:20 +0100
 
 bluez-libs (3.24-1) unstable; urgency=low
 

Added: packages/bluez-libs/trunk/debian/patches/003_configure_amd64_rpath.patch
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-libs/trunk/debian/patches/003_configure_amd64_rpath.patch?rev=663&op=file
==============================================================================
--- packages/bluez-libs/trunk/debian/patches/003_configure_amd64_rpath.patch (added)
+++ packages/bluez-libs/trunk/debian/patches/003_configure_amd64_rpath.patch Thu Jan 17 18:16:46 2008
@@ -1,0 +1,17 @@
+--- configure.orig	2008-01-12 17:10:45.000000000 +0100
++++ configure	2008-01-12 17:11:20.000000000 +0100
+@@ -8593,13 +8593,11 @@
+   # Some rework will be needed to allow for fast_install
+   # before this can be enabled.
+   hardcode_into_libs=yes
+-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ 
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on

Modified: packages/bluez-libs/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-libs/trunk/debian/rules?rev=663&op=diff
==============================================================================
--- packages/bluez-libs/trunk/debian/rules (original)
+++ packages/bluez-libs/trunk/debian/rules Thu Jan 17 18:16:46 2008
@@ -4,7 +4,7 @@
 
 soname=2
 
-DEB_SHLIBDEPS_INCLUDE = debian/libbluetooth2/usr/lib
+DEB_SHLIBDEPS_INCLUDE = debian/libbluetooth${soname}/usr/lib
 DEB_INSTALL_DOCS_libbluetooth${soname} = debian/README.Debian
 
 include /usr/share/cdbs/1/rules/buildcore.mk