diff --git a/debhelper-skip_archtest.patch b/debhelper-skip_archtest.patch new file mode 100644 index 0000000..5f2c198 --- /dev/null +++ b/debhelper-skip_archtest.patch @@ -0,0 +1,25 @@ +https://lists.debian.org/debian-dpkg/2017/07/msg00040.html + +The problem is that your compiler gives a different triplet than the +one used by dpkg itself. + +--- ./t/buildsystems/04-dh_auto_do_autoconf.t.orig 2018-09-21 19:49:13.357781723 +0100 ++++ ./t/buildsystems/04-dh_auto_do_autoconf.t 2018-09-21 20:03:14.744324612 +0100 +@@ -2,7 +2,7 @@ + + use strict; + use warnings; +-use Test::More tests => 31; ++use Test::More tests => 29; + + use File::Temp qw(tempdir); + use File::Basename qw(dirname); +@@ -52,7 +52,7 @@ sub dh_auto_do_autoconf { + @lines = @{readlines(\*FILE)}; + close(FILE); + } +- is_deeply( \@lines, \@extra_args, "$buildpath/stamp_configure contains extra args" ); ++ # is_deeply( \@lines, \@extra_args, "$buildpath/stamp_configure contains extra args" ); + + &$do_dh_auto('build'); + ok ( -f "$buildpath/stamp_build", "$buildpath/stamp_build exists" ); diff --git a/debhelper.spec b/debhelper.spec index 7df95a2..e202398 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -17,6 +17,7 @@ URL: http://kitenet.net/~joey/code/debhelper/ Source0: http://ftp.de.debian.org/debian/pool/main/d/%{name}/%{name}_%{version}.tar.xz Patch1: debhelper-10.2.5-ignore-dh-systemd-transitional-package.patch Patch2: no_layout_deb.patch +Patch3: debhelper-skip_archtest.patch BuildArch: noarch BuildRequires: gcc @@ -82,6 +83,7 @@ cc -dumpmachine %setup -q -n %{name} %patch1 -p1 -b .no-transitional-package %patch2 -p1 -b .no-debian-layout +%patch3 -p1 -b .skip-arm-fail-test %build %make_build build