Source: xjump
Version: 2.7.5-6.2
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
xjump fails to cross build from source, because it does not pass cross
tools to make. The easiest way of fixing that is using dh_auto_build.
Beyond that issue, it strips during make install via install -s using
the build architecture strip. Doing so also breaks generation of -dbgsym
packages as well as DEB_BUILD_OPTIONS=nostrip. It is best to leave
stripping to dh_strip. Please consider applying the attached patch to
fix all of that and make xjump cross buildable.
Helmut
diff --minimal -Nru xjump-2.7.5/debian/changelog xjump-2.7.5/debian/changelog
--- xjump-2.7.5/debian/changelog 2017-01-10 17:44:41.000000000 +0100
+++ xjump-2.7.5/debian/changelog 2020-04-18 22:55:15.000000000 +0200
@@ -1,3 +1,12 @@
+xjump (2.7.5-6.3) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: (Closes: #-1)
+ + Let dh_auto_build pass cross tools to make.
+ + Don't strip during make install, defer to dh_strip.
+
+ -- Helmut Grohne <hel...@subdivi.de> Sat, 18 Apr 2020 22:55:15 +0200
+
xjump (2.7.5-6.2) unstable; urgency=medium
* Non-maintainer upload.
diff --minimal -Nru xjump-2.7.5/debian/patches/cross.patch
xjump-2.7.5/debian/patches/cross.patch
--- xjump-2.7.5/debian/patches/cross.patch 1970-01-01 01:00:00.000000000
+0100
+++ xjump-2.7.5/debian/patches/cross.patch 2020-04-18 22:55:15.000000000
+0200
@@ -0,0 +1,20 @@
+--- xjump-2.7.5.orig/Makefile
++++ xjump-2.7.5/Makefile
+@@ -3,6 +3,8 @@
+ # ���Ѥ��륳��ѥ���ȥ��ץ��������
+ CC = gcc
+
++INSTALL ?= install
++
+ CFLAGS = -O2
+
+ # ɸ��ʳ��Υ��롼�ɥե�����Υǥ��쥯�ȥ�����
+@@ -58,7 +60,7 @@ record.o : record.c record.h Makefile
+
+
+ install : xjump
+- install -g games -c -s -m 2755 xjump $(DESTDIR)$(TARGET)
++ $(INSTALL) -g games -c -s -m 2755 xjump $(DESTDIR)$(TARGET)
+
+ clean:
+ rm -f *.o xjump *~
diff --minimal -Nru xjump-2.7.5/debian/patches/series
xjump-2.7.5/debian/patches/series
--- xjump-2.7.5/debian/patches/series 2012-04-12 11:01:25.000000000 +0200
+++ xjump-2.7.5/debian/patches/series 2020-04-18 22:55:15.000000000 +0200
@@ -3,3 +3,4 @@
03_source_warnings.patch
04_makefile_respect_cflags.patch
05_unneded_deps.patch
+cross.patch
diff --minimal -Nru xjump-2.7.5/debian/rules xjump-2.7.5/debian/rules
--- xjump-2.7.5/debian/rules 2017-01-10 17:44:41.000000000 +0100
+++ xjump-2.7.5/debian/rules 2020-04-18 22:55:15.000000000 +0200
@@ -8,7 +8,7 @@
build:
dh_testdir
- make CFLAGS="-O2 -g -Wall"
+ dh_auto_build -- CFLAGS="-O2 -g -Wall"
touch build
clean:
@@ -23,7 +23,7 @@
dh_prep
dh_installdirs
- make install DESTDIR=$(CURDIR)/debian/xjump
+ make install DESTDIR=$(CURDIR)/debian/xjump INSTALL='install
--strip-program=true'
install -m 644 -o root -g root xjump-icon.xpm
debian/xjump/usr/share/pixmaps/
cp debian/themes/* debian/xjump/usr/share/games/xjump/
for i in debian/xjump/usr/share/games/xjump/*; do gzip -9n $$i; done
