Bug#530712: Cross-build support in net-tools

[Steve McIntyre]

On Sat, Jun 18, 2011 at 11:04:37AM +0200, Luk Claes wrote:
>On 06/16/2011 10:15 AM, Martín Ferrari wrote:
>> Steve,
>> 
>> On Mon, Jun 13, 2011 at 11:18, Steve McIntyre <steve.mcintyre at linaro.org> wrote:
>> 
>>> :-( Ouch.
>>>
>>> I could do an NMU with some of the patches applied if that would help
>>> you.
>> 
>> That'd be fine to me, but Luk might want to do it himself.. Luk?
>
>Please do NMU, I'm doing other outstanding package uploads myself atm.

OK. NMU diff attached for 2 bug fixes (#451281 and #530712).

Cheers,
-- 
Steve McIntyre
steve.mcintyre at linaro.org
-------------- next part --------------
diff -u net-tools-1.60/debian/rules net-tools-1.60/debian/rules
--- net-tools-1.60/debian/rules
+++ net-tools-1.60/debian/rules
@@ -13,6 +13,12 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CROSS=CC=$(DEB_HOST_GNU_TYPE)-gcc
+else
+CROSS=
+endif
+
 configure: configure-stamp
 configure-stamp: $(QUILT_STAMPFN)
 	[ ! -f config.make ] || mv config.make debian/config.make.bk
@@ -25,7 +31,7 @@
 build: build-stamp
 build-stamp: configure-stamp
 	dh_testdir
-	$(MAKE) PROGS="ifconfig arp netstat route rarp slattach plipconfig \
+	$(MAKE) $(CROSS) PROGS="ifconfig arp netstat route rarp slattach plipconfig \
 		nameif iptunnel ipmaddr mii-tool"
 	touch $@
 
diff -u net-tools-1.60/debian/control net-tools-1.60/debian/control
--- net-tools-1.60/debian/control
+++ net-tools-1.60/debian/control
@@ -1,10 +1,11 @@
 Source: net-tools
 Section: net
 Priority: important
-Build-Depends: debhelper (> 5), gettext, quilt
+Build-Depends: debhelper (>> 5), gettext, quilt
 Maintainer: net-tools Team <pkg-net-tools-maintainers at lists.alioth.debian.org>
 Uploaders: Luk Claes <luk at debian.org>, Martín Ferrari <tincho at debian.org>
 Standards-Version: 3.8.1
+Homepage: http://net-tools.berlios.de/
 
 Package: net-tools
 Architecture: any
diff -u net-tools-1.60/debian/changelog net-tools-1.60/debian/changelog
--- net-tools-1.60/debian/changelog
+++ net-tools-1.60/debian/changelog
@@ -1,3 +1,11 @@
+net-tools (1.60-24.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add cross-build support, based on patch from Neil Williams. Closes: #451281
+  * debian/control: Add Homepage. Closes: #530712.
+
+ -- Steve McIntyre <steve.mcintyre at linaro.org>  Fri, 15 Jul 2011 14:58:52 +0100
+
 net-tools (1.60-24) unstable; urgency=low
 
   * debian/patches/Add_missing_headers.patch: Fix FTBFS (Closes: #625157).