--- Begin Message ---
Source: splix
Version: 2.0.0+svn315-5
Tags: patch
User: helmutg@debian.org
Usertags: rebootstrap
splix fails to cross build from source, because it uses the build
architecture compiler (and dh_strip later fails operating on the ELF
objects). The build hard codes g++ in two occasions and otherwise can be
fixed by passing proper CC and CXX to make. Please consider applying the
attached patch.
Helmut
diff --minimal -Nru splix-2.0.0+svn315/debian/changelog splix-2.0.0+svn315/debian/changelog
--- splix-2.0.0+svn315/debian/changelog 2016-06-12 17:04:14.000000000 +0200
+++ splix-2.0.0+svn315/debian/changelog 2016-09-09 22:35:38.000000000 +0200
@@ -1,3 +1,10 @@
+splix (2.0.0+svn315-5.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: Use triplet-prefixed compilers (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de> Fri, 09 Sep 2016 22:26:17 +0200
+
splix (2.0.0+svn315-5) unstable; urgency=medium
* Team upload
diff --minimal -Nru splix-2.0.0+svn315/debian/patches/0006-cross.patch splix-2.0.0+svn315/debian/patches/0006-cross.patch
--- splix-2.0.0+svn315/debian/patches/0006-cross.patch 1970-01-01 01:00:00.000000000 +0100
+++ splix-2.0.0+svn315/debian/patches/0006-cross.patch 2016-09-09 22:32:08.000000000 +0200
@@ -0,0 +1,22 @@
+From: Helmut Grohne <helmut@subdivi.de>
+Subject: Use compilers passed to make
+
+Index: splix-2.0.0+svn315/rules.mk
+===================================================================
+--- splix-2.0.0+svn315.orig/rules.mk
++++ splix-2.0.0+svn315/rules.mk
+@@ -6,12 +6,12 @@
+
+ $(rastertoqpdl_TARGET): $(rastertoqpdl_OBJ)
+ $(call printCmd, $(cmd_link))
+- $(Q)g++ -o $@ $^ $(rastertoqpdl_CXXFLAGS) $(rastertoqpdl_LDFLAGS) \
++ $(Q)$(CXX) -o $@ $^ $(rastertoqpdl_CXXFLAGS) $(rastertoqpdl_LDFLAGS) \
+ $(rastertoqpdl_LIBS)
+
+ $(pstoqpdl_TARGET): $(pstoqpdl_OBJ)
+ $(call printCmd, $(cmd_link))
+- $(Q)g++ -o $@ $^ $(pstoqpdl_CXXFLAGS) $(pstoqpdl_LDFLAGS) \
++ $(Q)$(CXX) -o $@ $^ $(pstoqpdl_CXXFLAGS) $(pstoqpdl_LDFLAGS) \
+ $(pstoqpdl_LIBS)
+
+ .PHONY: install installcms
diff --minimal -Nru splix-2.0.0+svn315/debian/patches/series splix-2.0.0+svn315/debian/patches/series
--- splix-2.0.0+svn315/debian/patches/series 2016-06-12 16:55:47.000000000 +0200
+++ splix-2.0.0+svn315/debian/patches/series 2016-09-09 22:31:22.000000000 +0200
@@ -2,3 +2,4 @@
0002-Dont-let-bash-trim-whitespace.patch
0003-fix-aready-typo.patch
0005-Set-debian-build-flags-during-build.patch
+0006-cross.patch
diff --minimal -Nru splix-2.0.0+svn315/debian/rules splix-2.0.0+svn315/debian/rules
--- splix-2.0.0+svn315/debian/rules 2016-06-12 17:01:56.000000000 +0200
+++ splix-2.0.0+svn315/debian/rules 2016-09-09 22:29:15.000000000 +0200
@@ -5,6 +5,13 @@
# Harden
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+include /usr/share/dpkg/architecture.mk
+ifeq ($(origin CC),default)
+CC = $(DEB_HOST_GNU_TYPE)-gcc
+endif
+ifeq ($(origin CXX),default)
+CXX = $(DEB_HOST_GNU_TYPE)-g++
+endif
derives_from_ubuntu := $(shell (dpkg-vendor --derives-from Ubuntu && echo "yes") || echo "no")
@@ -18,8 +25,8 @@
build-indep: build-stamp
build-stamp: configure-stamp
dh_testdir
- $(MAKE) V=1 drv
- $(MAKE) V=1 DRV_ONLY=1 rastertoqpdl_LIBS="-lcupsimage -lcups -lpthread -ljbig" pstoqpdl_LIBS="-lcupsimage -lcups -ljbig"
+ $(MAKE) V=1 drv CC=$(CC) CXX=$(CXX)
+ $(MAKE) V=1 DRV_ONLY=1 rastertoqpdl_LIBS="-lcupsimage -lcups -lpthread -ljbig" pstoqpdl_LIBS="-lcupsimage -lcups -ljbig" CC=$(CC) CXX=$(CXX)
touch $@
clean:
--- End Message ---
--- Begin Message ---
Source: splix
Source-Version: 2.0.0+svn315-6
We believe that the bug you reported is fixed in the latest version of
splix, 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 837182@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Didier Raboud <odyx@debian.org> (supplier of updated splix 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: Sun, 11 Sep 2016 16:01:42 +0200
Source: splix
Binary: printer-driver-splix
Architecture: source
Version: 2.0.0+svn315-6
Distribution: unstable
Urgency: medium
Maintainer: Debian Printing Team <debian-printing@lists.debian.org>
Changed-By: Didier Raboud <odyx@debian.org>
Description:
printer-driver-splix - Driver for Samsung and Xerox SPL2 and SPLc laser printers
Closes: 837182
Changes:
splix (2.0.0+svn315-6) unstable; urgency=medium
.
* Team upload
.
[ Helmut Grohne ]
* Fix FTCBFS: Use triplet-prefixed compilers (Closes: #837182)
.
[ Didier Raboud ]
* Drop splix transitional package which reached stable
Checksums-Sha1:
4b86aa1320a54202597efc1d4e5498e635d56a07 1779 splix_2.0.0+svn315-6.dsc
0ac170ebb600c0582c9097913bd6946982adae1f 6988 splix_2.0.0+svn315-6.debian.tar.xz
Checksums-Sha256:
9116348a23b1f1e099994d379dc9e4781f5c09307c55052d6a2983f1b46608af 1779 splix_2.0.0+svn315-6.dsc
3845ddcdd504fbebf6df98f000035f95bae40962c5fdeefa837e0e55cce74244 6988 splix_2.0.0+svn315-6.debian.tar.xz
Files:
095cd18215da8ac8b0f98ccf8436d96f 1779 text optional splix_2.0.0+svn315-6.dsc
680b135e2f7b060d5292e5ed45f25ddf 6988 text optional splix_2.0.0+svn315-6.debian.tar.xz
-----BEGIN PGP SIGNATURE-----
iQGcBAEBCgAGBQJX1WV3AAoJEIvPpx7KFjRVVUcL/0lxsLctSdue+ethrT10uD2O
Acz+quEivKF1lKa9eKloKnyIQ91C2y2KC+zKWooqYScK8+B9YBf3BinVxOJhuQgg
8b41PfPOMT9EHKPyXtTWV3Ff1qYqgm51PgYUBnY3MDfTiQyJPECAqwaMpxGMvWLF
xFK6lu29BUw4Q0z57atdYUVqSQ6+Png3WfwZMkr3A/kvWohoAcDSQxj4CVSjosWL
e59b+P4EF1sR4UY54/Jdh6XXhPdZ0r1Ti2DUawxBkisJ4n/edW8Uo6fn5ov8pvKB
CfgQwryDmaTWfU1Qv9NvSE+ScCtnwTja7o8XwYkKbkuxQEzCtvfOIXX8bVpM14qF
059ShIb8NNnI5pxs2+yL0MJXpUz/aA/LJt2pGSfPiQt8U3zACTGZ8q143lSoPZAD
Y6+0yomV+1GaF3efHyNnzUAT1rsM+FCLalUslrzQEGNLixthvnq6vhXz6CK0ROjL
CBG709phbfbOn+T2/r2977Wpys8wScje30m0p7B2Uw==
=Ewwh
-----END PGP SIGNATURE-----
--- End Message ---