Source: scantool
Version: 1.21+dfsg-7
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

Hi Kees,

Excuse my "many little patches" strategy here. scantool is being a
little difficult. When I filed #915275 (not passing --host to
./configure), that fixed the immediate failure and it ran into #915196
(allegro failure). I didn't see any failures below at that time.

Now both bugs are fixed and we can see further. After the autotools
build, there is a plain makefile based build in the toplevel directory.
This build also happens for the wrong architecture and the simplest fix
is dh_auto_build. That's what the attached patch does.

Even with the patch, scantool still fails to cross build, because it
fails running "dat" in debian/codes. Very likely, this means that we'll
have to change liballegro4-dev. I haven't filed a bug there yet, because
I'm unsure about the exact solution. In the mean time, would you take my
second patch for scantool? (Again, just close this bug when applying it.
That's a great notification mechanism.)

Helmut
diff --minimal -Nru scantool-1.21+dfsg/debian/changelog 
scantool-1.21+dfsg/debian/changelog
--- scantool-1.21+dfsg/debian/changelog 2019-01-13 18:30:59.000000000 +0100
+++ scantool-1.21+dfsg/debian/changelog 2019-01-29 07:05:08.000000000 +0100
@@ -1,3 +1,11 @@
+scantool (1.21+dfsg-7.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Address FTCBFS: Let dh_auto_build pass cross tools to make.
+    (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Tue, 29 Jan 2019 07:05:08 +0100
+
 scantool (1.21+dfsg-7) unstable; urgency=low
 
   * Fix FTCBFS: Let dh_auto_configure pass --host to ./configure,
diff --minimal -Nru scantool-1.21+dfsg/debian/rules 
scantool-1.21+dfsg/debian/rules
--- scantool-1.21+dfsg/debian/rules     2019-01-13 18:30:59.000000000 +0100
+++ scantool-1.21+dfsg/debian/rules     2019-01-29 07:04:54.000000000 +0100
@@ -18,7 +18,7 @@
        cd dzcomm && \
                $(MAKE) depend && \
                $(MAKE) lib
-       $(MAKE) CFLAGS="$(CPPFLAGS) $(CFLAGS) -Idzcomm/include 
-DDZCOMM_DJGPP=1" LDFLAGS="$(LDFLAGS) -Ldzcomm/lib/unix"
+       dh_auto_build -- CFLAGS="$(CPPFLAGS) $(CFLAGS) -Idzcomm/include 
-DDZCOMM_DJGPP=1" LDFLAGS="$(LDFLAGS) -Ldzcomm/lib/unix"
        $(MAKE) -C debian/codes
 
 override_dh_clean:

Reply via email to