Hi Helmut,
Is there anything I need to do in the upstream sources? As far as I
can see you patched just the debian build rules, right?
Roger.
On Thu, Oct 06, 2016 at 05:44:13AM +0200, Helmut Grohne wrote:
> Source: mtr
> Version: 0.86-1
> Tags: patch
> User: [email protected]
> Usertags: rebootstrap
>
> mtr fails to cross build from source, because it doesn't pass --host to
> configure. Rather than extending the long line even further, I opted for
> using dh_auto_configure in the attached patch. It also simplifies the
> management of installation paths by leveraging DESTDIR, which is why I
> also had to switch to dh_auto_install. After switching to
> dh_auto_configure cross builds just work. Can you apply it?
>
> Helmut
> diff --minimal -Nru mtr-0.86/debian/changelog mtr-0.86/debian/changelog
> --- mtr-0.86/debian/changelog 2015-12-07 20:37:45.000000000 +0100
> +++ mtr-0.86/debian/changelog 2016-10-06 05:27:27.000000000 +0200
> @@ -1,3 +1,10 @@
> +mtr (0.86-1.1) UNRELEASED; urgency=medium
> +
> + * Non-maintainer upload.
> + * Fix FTCBFS: Let dh_auto_configure pass cross flags, closes: #-1
> +
> + -- Helmut Grohne <[email protected]> Thu, 06 Oct 2016 05:27:09 +0200
> +
> mtr (0.86-1) unstable; urgency=low
>
> * Added patch from Andrew Suffield to use setcap instead of setuid,
> diff --minimal -Nru mtr-0.86/debian/rules mtr-0.86/debian/rules
> --- mtr-0.86/debian/rules 2015-12-07 21:02:22.000000000 +0100
> +++ mtr-0.86/debian/rules 2016-10-06 05:38:41.000000000 +0200
> @@ -15,9 +15,9 @@
>
> autoreconf -fi
>
> - mkdir mtr && cd mtr && CFLAGS=-I.. ../configure $(shell dpkg-buildflags
> --export=configure >/dev/null 2>&1 && dpkg-buildflags --export=configure)
> $(confflags) --prefix=`pwd`/debian/tmp/usr
> --mandir=`pwd`/debian/tmp/usr/share/man --sbindir=`pwd`/debian/tmp/usr/bin
> + CFLAGS=-I.. dh_auto_configure --builddirectory=mtr -- $(shell
> dpkg-buildflags --export=configure >/dev/null 2>&1 && dpkg-buildflags
> --export=configure) $(confflags)
>
> - mkdir mtr-tiny && cd mtr-tiny && CFLAGS=-I.. ../configure $(shell
> dpkg-buildflags --export=configure >/dev/null 2>&1 && dpkg-buildflags
> --export=configure) $(confflags) --prefix=`pwd`/debian/tmp/usr
> --mandir=`pwd`/debian/tmp/usr/share/man --sbindir=`pwd`/debian/tmp/usr/bin
> --without-gtk
> + CFLAGS=-I.. dh_auto_configure --builddirectory=mtr-tiny -- $(shell
> dpkg-buildflags --export=configure >/dev/null 2>&1 && dpkg-buildflags
> --export=configure) $(confflags) --without-gtk
>
>
>
> @@ -40,10 +40,8 @@
>
> override_dh_installdirs-arch:
> dh_installdirs -a
> - $(MAKE) -C mtr-tiny prefix=`pwd`/debian/mtr-tiny/usr install
> - mv mtr-tiny/debian/tmp/usr/bin/mtr debian/mtr-tiny/usr/bin/
> - $(MAKE) -C mtr prefix=`pwd`/debian/mtr/usr install
> - mv mtr/debian/tmp/usr/bin/mtr debian/mtr/usr/bin/
> + dh_auto_install --builddirectory=mtr-tiny --destdir=debian/mtr-tiny
> + dh_auto_install --builddirectory=mtr --destdir debian/mtr
>
> override_dh_installchangelogs-arch:
> dh_installchangelogs -a NEWS
--
** [email protected] ** http://www.BitWizard.nl/ ** +31-15-2600998 **
** Delftechpark 26 2628 XH Delft, The Netherlands. KVK: 27239233 **
*-- BitWizard writes Linux device drivers for any device you may have! --*
The plan was simple, like my brother-in-law Phil. But unlike
Phil, this plan just might work.
