--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: z8530-utils2 FTCBFS: does not use cross tools
- From: Helmut Grohne <helmut@subdivi.de>
- Date: Sun, 8 Sep 2019 20:02:54 +0200
- Message-id: <20190908180253.GA10306@alf.mars>
Source: z8530-utils2
Version: 3.0-1-9
Tags: patch
User: debian-cross@lists.debian.org
Usertags: ftcbfs
z8530-utils2 fails to cross build from source, because it uses the build
architecture compiler. The easiest way of passing cross tools to make is
using dh_auto_build. Unfortunately, the upstream Makefile does not
recognize standard substitutions such as CC and needs to be patched.
Similarly, it insists on stripping at installation time, which also
breaks DEB_BUILD_OPTIONS=nostrip as well as generation of -dbgsym
packages. It is best to defer all stripping to dh_strip. This can be
achieved by replacing install with a non-stripping install. Please
consider applying the attached patch.
Helmut
diff -u z8530-utils2-3.0-1/Makefile z8530-utils2-3.0-1/Makefile
--- z8530-utils2-3.0-1/Makefile
+++ z8530-utils2-3.0-1/Makefile
@@ -9,27 +9,27 @@
utils: sccparam sccstat sccinit gencfg kissbridge
sccparam: sccparam.c
- gcc ${CCOPT} sccparam.c -o $@
+ $(CC) ${CCOPT} sccparam.c -o $@
sccstat: sccstat.c
- gcc ${CCOPT} sccstat.c -o $@
+ $(CC) ${CCOPT} sccstat.c -o $@
sccinit: sccinit.c
- gcc ${CCOPT} sccinit.c -o $@
+ $(CC) ${CCOPT} sccinit.c -o $@
gencfg: gencfg.c
- gcc ${CCOPT} gencfg.c -o $@
+ $(CC) ${CCOPT} gencfg.c -o $@
kissbridge: kissbridge.c
- gcc ${CCOPT} kissbridge.c -o $@
+ $(CC) ${CCOPT} kissbridge.c -o $@
install:
- install -s -g root -o root -m 0755 -s gencfg $(DESTDIR)/usr/bin/gencfg
- install -s -g root -o root -m 0755 -s sccstat $(DESTDIR)/usr/bin/sccstat
- install -s -g root -o root -m 0700 -s sccinit $(DESTDIR)/usr/sbin/sccinit
- install -s -g root -o root -m 0700 -s sccparam $(DESTDIR)/usr/sbin/sccparam
- install -s -g root -o root -m 0700 -s kissbridge $(DESTDIR)/usr/sbin/kissbridge
- install -g root -o root -m 0644 z8530drv.conf $(DESTDIR)/etc/z8530drv.conf
+ $(INSTALL) -s -g root -o root -m 0755 -s gencfg $(DESTDIR)/usr/bin/gencfg
+ $(INSTALL) -s -g root -o root -m 0755 -s sccstat $(DESTDIR)/usr/bin/sccstat
+ $(INSTALL) -s -g root -o root -m 0700 -s sccinit $(DESTDIR)/usr/sbin/sccinit
+ $(INSTALL) -s -g root -o root -m 0700 -s sccparam $(DESTDIR)/usr/sbin/sccparam
+ $(INSTALL) -s -g root -o root -m 0700 -s kissbridge $(DESTDIR)/usr/sbin/kissbridge
+ $(INSTALL) -g root -o root -m 0644 z8530drv.conf $(DESTDIR)/etc/z8530drv.conf
clean:
rm -f *.o *~ doc/*~ sccstat sccinit sccparam gencfg kissbridge
@@ -51,7 +51,7 @@
z8530drv-utils/z8530drv.conf z8530drv-utils/*.lsm)
dep:
- gcc ${CCOPT} -M sccstat.c sccinit.c sccparam.c kissbridge.c gencfg.c >.depend
+ $(CC) ${CCOPT} -M sccstat.c sccinit.c sccparam.c kissbridge.c gencfg.c >.depend
ifeq (.depend,$(wildcard .depend))
include .depend
diff -u z8530-utils2-3.0-1/debian/changelog z8530-utils2-3.0-1/debian/changelog
--- z8530-utils2-3.0-1/debian/changelog
+++ z8530-utils2-3.0-1/debian/changelog
@@ -1,3 +1,14 @@
+z8530-utils2 (3.0-1-9.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: (Closes: #-1)
+ + Let dh_auto_build pass cross tools to make.
+ + Makefile: don't hard code gcc
+ + Pass a non-stripping install to make install.
+ + Makefile: don't hard code install
+
+ -- Helmut Grohne <helmut@subdivi.de> Sun, 08 Sep 2019 19:54:14 +0200
+
z8530-utils2 (3.0-1-9) unstable; urgency=medium
* Remove hamish from Uploaders as he has retired from Debian Closes: 831488
diff -u z8530-utils2-3.0-1/debian/rules z8530-utils2-3.0-1/debian/rules
--- z8530-utils2-3.0-1/debian/rules
+++ z8530-utils2-3.0-1/debian/rules
@@ -36,9 +36,7 @@
build-stamp: configure-stamp
dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
+ dh_auto_build
#docbook-to-man debian/z8530-utils2-3.0.sgml > z8530-utils2-3.0.1
touch build-stamp
@@ -60,7 +58,7 @@
dh_installdirs
# Add here commands to install the package into debian/z8530-utils2.
- $(MAKE) install DESTDIR=$(CURDIR)/debian/z8530-utils2
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/z8530-utils2 INSTALL='install --strip-program=true'
# Build architecture-independent files here.
--- End Message ---
--- Begin Message ---
Source: z8530-utils2
Source-Version: 3.0-1-10
We believe that the bug you reported is fixed in the latest version of
z8530-utils2, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 939777@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
tony mancill <tmancill@debian.org> (supplier of updated z8530-utils2 package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Fri, 04 Oct 2019 20:58:39 -0700
Source: z8530-utils2
Architecture: source
Version: 3.0-1-10
Distribution: unstable
Urgency: medium
Maintainer: Debian Hamradio Maintainers <debian-hams@lists.debian.org>
Changed-By: tony mancill <tmancill@debian.org>
Closes: 939777
Changes:
z8530-utils2 (3.0-1-10) unstable; urgency=medium
.
* Team upload
.
[ Helmut Grohne ]
* Fix FTCBFS: (Closes: #939777)
+ Let dh_auto_build pass cross tools to make.
+ Makefile: don't hard code gcc
+ Pass a non-stripping install to make install.
+ Makefile: don't hard code install
.
[ tony mancill ]
* Set Vcs- fields in debian/control for Salsa repo
* Update debian/rules to use dh sequencer.
* Use debhelper 12
* Add hardening=+all to DEB_BUILD_MAINT_OPTIONS
* Update Priority in debian/control from extra to optional
* Address debian-rules-should-not-set-CFLAGS-from-noopt lintian warning
* Check for MAKEDEV before invoking it in postint
* Address typos in manpages
* Bump Standards-Version to 4.4.1
* debian/source/format is now "3.0 (quilt)"
Revert patches applied directly to upstream source and
migrate source format 1.0 changes to quilt patches
Checksums-Sha1:
6ec1a1e7465eb062676418b1ba96b41086ccfdf5 2031 z8530-utils2_3.0-1-10.dsc
3b57641b0e58f6e14217ad5816748668bbb7a6b2 6864 z8530-utils2_3.0-1-10.debian.tar.xz
2219902e315fbba17c820f6aa1f61d1e7b442b03 5995 z8530-utils2_3.0-1-10_amd64.buildinfo
Checksums-Sha256:
e361ee1e41cd442bb9e9db0ceed82c4ac618a3b57905a91632a834c960348450 2031 z8530-utils2_3.0-1-10.dsc
7d617fa21db0406f0b30d45362afa897d668940026947841b4173069e80b1532 6864 z8530-utils2_3.0-1-10.debian.tar.xz
49101e38f94dde99863d609f49f27781dd257912150ffed8134e023c4d451e8d 5995 z8530-utils2_3.0-1-10_amd64.buildinfo
Files:
972045f1725ce64f80d256e9bad2b1b8 2031 hamradio optional z8530-utils2_3.0-1-10.dsc
db1bbd421674ad1673a0bb3c38bc0c8a 6864 hamradio optional z8530-utils2_3.0-1-10.debian.tar.xz
b87c594b3bfa0d71fc0a15b044824613 5995 hamradio optional z8530-utils2_3.0-1-10_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQJIBAEBCgAyFiEE5Qr9Va3SequXFjqLIdIFiZdLPpYFAl2YFa8UHHRtYW5jaWxs
QGRlYmlhbi5vcmcACgkQIdIFiZdLPpZPDA//arzSFcEySkBhXkRYAXmXix1zkTOI
tUCN4lbpM5N2Jv50OlYgFPJwHp17BZAk07t8eCKI/1EA75i0uJ/hAi0zF1ILWIXF
5+JwwhZxvNTRJBNjcK+CHqqeJmKOdJz1ojoQiChZIQMAzo/B5Y31inR2PNRC22Ok
Wn8SZjfZFBTGbhkCnzfM1ne+2vYHeAZG2Scp8lk95Eui9p2Q5h/8GVe9AHEfDzR4
y6RmHQBFRtPy5iKkP4ZJ9JAqBTrXs4rOhMQ+H1u0KimW8xdGY3foq3g9THOG0SWi
81cWZKLh1uOqDFcf8XSUjpG8O7t7frnAyoNTT5PnADp7IggHLnwKfF6/nluukCI6
Mtdt9fjwAsZZ57d+06z9bEaL3pNHv53BxZ6RZl4Tpqg1JQnShBLi8ePdPJqLavrP
UBAzX2p6yJorsjGMff3fsFBIWGINmCTjpThcovjJaW+fMyI9O8kvRCucBPwiHFbg
qtrSKY9VHA6e43igOkMO1iDBPCeu30S6wvJJ5hs967GIoPbCpdKhnxdkNkQkxtIl
l8JTLFwIn2gb/qkvADWMsxazZrdkeRK5Opq9YKYJwjqWbmDpDefBYQGSi9cXH2Gj
qR6TH+ggMo6u00WmA989SGF7rXWZ8g8tbZdl2PXEbpTYqQzXsNav+8zgqiNGkyam
IySyP6ZRI2s1AQc=
=et9m
-----END PGP SIGNATURE-----
--- End Message ---