Source: xfireworks
Version: 1.3-10
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
xfireworks fails to cross build from source, because it uses the build
architecture compiler. debian/rules fails to pass cross compilers along.
The easiest way of fixing that is using dh_auto_build. Then, it fails
running ./mkconf, which needs to be compiled using the build
architecture compiler unlike the rest. After fixing that as well,
xfireworks cross builds successfully. Please consider applying the
attached patch.
Helmut
diff --minimal -Nru xfireworks-1.3/debian/changelog
xfireworks-1.3/debian/changelog
--- xfireworks-1.3/debian/changelog 2015-08-15 17:31:33.000000000 +0200
+++ xfireworks-1.3/debian/changelog 2018-11-15 21:59:55.000000000 +0100
@@ -1,3 +1,10 @@
+xfireworks (1.3-10.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: (Closes: #-1)
+ + Let dh_auto_bild pass cross tools to make.
+ + cross.patch: Use the build architecture compiler for mkconf.c.
+
+ -- Helmut Grohne <hel...@subdivi.de> Thu, 15 Nov 2018 21:59:55 +0100
+
xfireworks (1.3-10) unstable; urgency=low
[ Yukiharu YABUKI ]
diff --minimal -Nru xfireworks-1.3/debian/control xfireworks-1.3/debian/control
--- xfireworks-1.3/debian/control 2015-08-15 17:26:37.000000000 +0200
+++ xfireworks-1.3/debian/control 2018-11-15 21:59:43.000000000 +0100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Yukiharu YABUKI <yyab...@debian.org>
Standards-Version: 3.9.6
-Build-Depends: libx11-dev, debhelper (>= 5)
+Build-Depends: libx11-dev, debhelper (>= 7)
Package: xfireworks
Architecture: any
diff --minimal -Nru xfireworks-1.3/debian/patches/cross.patch
xfireworks-1.3/debian/patches/cross.patch
--- xfireworks-1.3/debian/patches/cross.patch 1970-01-01 01:00:00.000000000
+0100
+++ xfireworks-1.3/debian/patches/cross.patch 2018-11-15 21:59:55.000000000
+0100
@@ -0,0 +1,19 @@
+--- xfireworks-1.3.orig/Makefile
++++ xfireworks-1.3/Makefile
+@@ -13,6 +13,7 @@
+ CFLAGS = -O
+ LFLAGS = -lm -lX11
+ CC = cc
++CC_FOR_BUILD ?= $(CC)
+ CP = cp
+ RM = rm -f
+ MKDIR = mkdir -p
+@@ -66,7 +67,7 @@
+ cat xfireworks.conf | ./mkconf > xfireworks_conf.h
+
+ mkconf : mkconf.c
+- $(CC) $(CPPFLAGS) $(CFLAGS) mkconf.c -o mkconf
++ $(CC_FOR_BUILD) $(CPPFLAGS) $(CFLAGS) mkconf.c -o mkconf
+
+ etc.o : etc.c
+ $(CC) -c etc.c $(CPPFLAGS) $(CFLAGS)
diff --minimal -Nru xfireworks-1.3/debian/patches/series
xfireworks-1.3/debian/patches/series
--- xfireworks-1.3/debian/patches/series 2012-07-10 21:52:56.000000000
+0200
+++ xfireworks-1.3/debian/patches/series 2018-11-15 21:59:55.000000000
+0100
@@ -1,2 +1,3 @@
debian-changes-1.3-7
hardening
+cross.patch
diff --minimal -Nru xfireworks-1.3/debian/rules xfireworks-1.3/debian/rules
--- xfireworks-1.3/debian/rules 2015-08-15 17:32:31.000000000 +0200
+++ xfireworks-1.3/debian/rules 2018-11-15 21:59:55.000000000 +0100
@@ -2,6 +2,9 @@
# Sample debian/rules that uses debhelper.
# GNU copyright 1997 to 1999 by Joey Hess.
+-include /usr/share/dpkg/buildtools.mk
+export CC_FOR_BUILD ?= $(CC)
+
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -16,7 +19,7 @@
# Add here commands to compile the package.
- $(MAKE) BINDIR=/usr/games LIBDIR=/etc/X11/xfireworks
MANDIR=/usr/share/man/man6 GZIP=-9n
+ dh_auto_build -- BINDIR=/usr/games LIBDIR=/etc/X11/xfireworks
MANDIR=/usr/share/man/man6 GZIP=-9n
touch build-stamp
