Source: snake4
Version: 1.0.14-1
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

snake4 fails to cross build from source, because make install strips
with the wrong strip. Stripping at make install time not only breaks
cross compilation, but also the generation of -dbgsym packages and
DEB_BUILD_OPTIONS=nocheck. As such I porpose removing it. Please
consider applying the attached patch.

Helmut
diff --minimal -Nru snake4-1.0.14/debian/changelog 
snake4-1.0.14/debian/changelog
--- snake4-1.0.14/debian/changelog      2014-08-18 15:07:37.000000000 +0200
+++ snake4-1.0.14/debian/changelog      2018-11-14 06:18:56.000000000 +0100
@@ -1,3 +1,10 @@
+snake4 (1.0.14-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Don't strip during make install. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Wed, 14 Nov 2018 06:18:56 +0100
+
 snake4 (1.0.14-1) unstable; urgency=medium
 
   * New upstream release
diff --minimal -Nru snake4-1.0.14/debian/patches/cross.patch 
snake4-1.0.14/debian/patches/cross.patch
--- snake4-1.0.14/debian/patches/cross.patch    1970-01-01 01:00:00.000000000 
+0100
+++ snake4-1.0.14/debian/patches/cross.patch    2018-11-14 06:17:12.000000000 
+0100
@@ -0,0 +1,27 @@
+--- snake4-1.0.14.orig/Makefile
++++ snake4-1.0.14/Makefile
+@@ -65,6 +65,7 @@
+ ###########################################################################
+ 
+ CC            = gcc
++INSTALL               ?= install
+ 
+ OPTIM         = -s -O2
+ CCOPT         = -Wall $(OPTIM) $(INCDIR) $(DEFINES) $(CFLAGS)
+@@ -92,12 +93,12 @@
+       rm -f *.o core depend *~ $(PROG)
+ 
+ install: $(PROG)
+-      install -d -m 755 $(INSTBINDIR) $(INSTLIBDIR) $(INSTMANDIR)
+-      install -s -m 4755 -o $(OWNER) -g $(GROUP) $(PROG) $(INSTBINDIR)
++      $(INSTALL) -d -m 755 $(INSTBINDIR) $(INSTLIBDIR) $(INSTMANDIR)
++      $(INSTALL) -s -m 4755 -o $(OWNER) -g $(GROUP) $(PROG) $(INSTBINDIR)
+       ln -sf $(PROG) $(INSTBINDIR)/snake4scores
+-      install -m 644 $(DIST).6 $(INSTMANDIR)
++      $(INSTALL) -m 644 $(DIST).6 $(INSTMANDIR)
+       if test ! -f $(SCOREFILE); then \
+-        install -m 644 -o $(OWNER) -g $(GROUP) \
++        $(INSTALL) -m 644 -o $(OWNER) -g $(GROUP) \
+                 $(SCOREBASEFILE) $(INSTLIBDIR); fi
+ 
+ depend dep:
diff --minimal -Nru snake4-1.0.14/debian/patches/series 
snake4-1.0.14/debian/patches/series
--- snake4-1.0.14/debian/patches/series 2014-08-18 13:43:09.000000000 +0200
+++ snake4-1.0.14/debian/patches/series 2018-11-14 06:16:32.000000000 +0100
@@ -1,3 +1,4 @@
 useless-linkage.patch
 hardening.patch
 standard-install-directories.patch
+cross.patch
diff --minimal -Nru snake4-1.0.14/debian/rules snake4-1.0.14/debian/rules
--- snake4-1.0.14/debian/rules  2014-08-15 01:45:50.000000000 +0200
+++ snake4-1.0.14/debian/rules  2018-11-14 06:18:55.000000000 +0100
@@ -5,6 +5,9 @@
 %:
        dh $@ --parallel
 
+override_dh_auto_install: # drop with debhelper compat 10
+       dh_auto_install -- 'INSTALL=install --strip-program=true'
+
 override_dh_fixperms:
        chown 'root:games' debian/snake4/usr/games/snake4
        chmod 2755 debian/snake4/usr/games/snake4

Reply via email to