[Pkg-ofed-commits] r404 - in /trunk/infiniband-diags/trunk/debian: ./ patches/

[opensides-guest at alioth.debian.org]

Author: opensides-guest
Date: Mon Aug  3 12:33:47 2009
New Revision: 404

URL: http://svn.debian.org/wsvn/pkg-ofed/?sc=1&rev=404
Log:
- Backporting fixes from sid-uploads


Added:
    trunk/infiniband-diags/trunk/debian/patches/
    trunk/infiniband-diags/trunk/debian/patches/00list
    trunk/infiniband-diags/trunk/debian/patches/01_remove_rpath.dpatch   (with props)
Modified:
    trunk/infiniband-diags/trunk/debian/control
    trunk/infiniband-diags/trunk/debian/rules

Modified: trunk/infiniband-diags/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ofed/trunk/infiniband-diags/trunk/debian/control?rev=404&op=diff
==============================================================================
--- trunk/infiniband-diags/trunk/debian/control (original)
+++ trunk/infiniband-diags/trunk/debian/control Mon Aug  3 12:33:47 2009
@@ -2,7 +2,7 @@
 Section: net
 Priority: extra
 Maintainer: Guy Coates <gmpc at sanger.ac.uk>
-Build-Depends: debhelper (>= 7), autotools-dev, libibcommon-dev, libibumad-dev, libibmad-dev, libopensm2-dev (>=3.2.5)
+Build-Depends: debhelper (>= 7), autotools-dev, dpatch, libibcommon-dev, libibumad-dev, libibmad-dev, libopensm2-dev (>=3.2.5)
 Standards-Version: 3.8.0
 Homepage: http://www.openfabircs.org
 

Added: trunk/infiniband-diags/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ofed/trunk/infiniband-diags/trunk/debian/patches/00list?rev=404&op=file
==============================================================================
--- trunk/infiniband-diags/trunk/debian/patches/00list (added)
+++ trunk/infiniband-diags/trunk/debian/patches/00list Mon Aug  3 12:33:47 2009
@@ -1,0 +1,1 @@
+01_remove_rpath

Added: trunk/infiniband-diags/trunk/debian/patches/01_remove_rpath.dpatch
URL: http://svn.debian.org/wsvn/pkg-ofed/trunk/infiniband-diags/trunk/debian/patches/01_remove_rpath.dpatch?rev=404&op=file
==============================================================================
--- trunk/infiniband-diags/trunk/debian/patches/01_remove_rpath.dpatch (added)
+++ trunk/infiniband-diags/trunk/debian/patches/01_remove_rpath.dpatch Mon Aug  3 12:33:47 2009
@@ -1,0 +1,42 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_remove_rpath.dpatch by  <benoit at catbert.opensides.be>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove the rpath parameter from Makefile.am
+
+ at DPATCH@
+
+--- trunk/Makefile.am	2009-07-29 14:58:01.000000000 +0200
++++ trunk/Makefile.am	2009-07-31 23:35:56.000000000 +0200
+@@ -37,7 +37,6 @@
+ 
+ src_ibnetdiscover_SOURCES = src/ibnetdiscover.c src/grouping.c src/ibdiag_common.c
+ src_ibnetdiscover_CFLAGS = -Wall $(DBGFLAGS)
+-src_ibnetdiscover_LDFLAGS = -Wl,--rpath -Wl,$(libdir)
+ 
+ src_ibping_SOURCES = src/ibping.c src/ibdiag_common.c
+ src_ibping_CFLAGS = -Wall $(DBGFLAGS)
+@@ -56,7 +55,6 @@
+ 
+ src_ibtracert_SOURCES = src/ibtracert.c src/ibdiag_common.c
+ src_ibtracert_CFLAGS = -Wall $(DBGFLAGS)
+-src_ibtracert_LDFLAGS = -Wl,--rpath -Wl,$(libdir)
+ 
+ src_perfquery_SOURCES = src/perfquery.c src/ibdiag_common.c
+ src_perfquery_CFLAGS = -Wall $(DBGFLAGS)
+@@ -69,15 +67,12 @@
+ 
+ src_smpquery_SOURCES = src/smpquery.c src/ibdiag_common.c
+ src_smpquery_CFLAGS = -Wall $(DBGFLAGS)
+-src_smpquery_LDFLAGS = -Wl,--rpath -Wl,$(libdir)
+ 
+ src_saquery_SOURCES = src/saquery.c src/ibdiag_common.c
+ src_saquery_CFLAGS = -Wall -DOSM_VENDOR_INTF_OPENIB -DVENDOR_RMPP_SUPPORT -DDUAL_SIDED_RMPP $(DBGFLAGS)
+-src_saquery_LDFLAGS = -Wl,--rpath -Wl,$(libdir)
+ 
+ src_ibsendtrap_SOURCES = src/ibsendtrap.c src/ibdiag_common.c
+ src_ibsendtrap_CFLAGS = -Wall $(DBGFLAGS)
+-src_ibsendtrap_LDFLAGS = -Wl,--rpath -Wl,$(libdir)
+ 
+ src_vendstat_SOURCES = src/vendstat.c src/ibdiag_common.c
+ src_vendstat_CFLAGS = -Wall $(DBGFLAGS)

Propchange: trunk/infiniband-diags/trunk/debian/patches/01_remove_rpath.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/infiniband-diags/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ofed/trunk/infiniband-diags/trunk/debian/rules?rev=404&op=diff
==============================================================================
--- trunk/infiniband-diags/trunk/debian/rules (original)
+++ trunk/infiniband-diags/trunk/debian/rules Mon Aug  3 12:33:47 2009
@@ -22,7 +22,7 @@
 
 
 
-config.status: configure
+config.status: patch configure
 	dh_testdir
 	# Add here commands to configure the package.
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
@@ -31,7 +31,7 @@
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" --with-perl-installdir=/usr/share/perl5 --sbindir=/usr/sbin
+	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" --with-perl-installdir=/usr/share/perl5 --sbindir=/usr/sbin
 
 
 build: build-stamp
@@ -45,7 +45,8 @@
 
 	touch $@
 
-clean: 
+clean: clean-patched unpatch
+clean-patched:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
@@ -55,6 +56,16 @@
 	rm -f config.sub config.guess
 
 	dh_clean 
+
+
+patch: patch-stamp
+patch-stamp:
+	dpatch apply-all
+	dpatch cat-all >patch-stamp
+
+unpatch:
+	dpatch deapply-all
+	rm -rf patch-stamp debian/patched
 
 install: build
 	dh_testdir