aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2008-03-12 11:33:41 -0700
committerRoland Dreier <rolandd@cisco.com>2008-03-12 11:33:41 -0700
commit719b36bc1d93d641f059d7805b3dfc2a545a737d (patch)
tree4c8177cba973567a1695f7ecb0b9d3d8eb19b4d6
parent2226469edcd054b5086040fb6281531482fa4992 (diff)
downloadlibmthca-719b36bc1d93d641f059d7805b3dfc2a545a737d.tar.gz
Update Debian build to avoid setting RPATH
Use DEB_AUTO_UPDATE_LIBTOOL to avoid setting RPATH on amd64. Also let cdbs generate build-deps automatically (move control to control.in). Signed-off-by: Roland Dreier <rolandd@cisco.com>
-rw-r--r--debian/changelog5
-rw-r--r--debian/control.in (renamed from debian/control)2
-rwxr-xr-xdebian/rules1
3 files changed, 5 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 3224edd..b787cb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
libmthca (1.0.4-2) unstable; urgency=low
* Replace deprecated ${Source-Version} with ${binary:Version}
- * Add debian/watch file
+ * Add debian/watch file.
+ * Update libtool during build to avoid setting RPATH in binaries on amd64.
- -- Roland Dreier <rolandd@cisco.com> Wed, 12 Mar 2008 10:39:22 -0700
+ -- Roland Dreier <rolandd@cisco.com> Wed, 12 Mar 2008 11:29:50 -0700
libmthca (1.0.4-1) unstable; urgency=low
diff --git a/debian/control b/debian/control.in
index c941d50..6f78a09 100644
--- a/debian/control
+++ b/debian/control.in
@@ -1,7 +1,7 @@
Source: libmthca
Priority: extra
Maintainer: Roland Dreier <rolandd@cisco.com>
-Build-Depends: dpkg-dev (>= 1.13.19), cdbs (>= 0.4.25-1), debhelper (>= 5), libibverbs-dev (>= 1.1), autotools-dev
+Build-Depends: @cdbs@, dpkg-dev (>= 1.13.19), libibverbs-dev (>= 1.1)
Standards-Version: 3.7.3
Section: libs
diff --git a/debian/rules b/debian/rules
index cc4b1ef..3e70bc3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,7 @@
# -*- mode: makefile; coding: utf-8 -*-
DEB_DH_INSTALL_SOURCEDIR := debian/tmp
+DEB_AUTO_UPDATE_LIBTOOL := post
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk