Source: goattracker
Version: 2.74+dfsg1-1
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
goattracker fails to cross build from source, because it does not pass
cross tools to make. Using dh_auto_build mostly fixes that except for a
few hard coded compiler invocations that need to be made substitutable.
Please consider applying the attached patch.
Helmut
--- goattracker-2.74+dfsg1/debian/changelog
+++ goattracker-2.74+dfsg1/debian/changelog
@@ -1,3 +1,12 @@
+goattracker (2.74+dfsg1-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: (Closes: #-1)
+ + Let dh_auto_build pass cross tools to make.
+ + cross.patch: Make gcc substitutable.
+
+ -- Helmut Grohne <hel...@subdivi.de> Tue, 06 Mar 2019 19:11:13 +0100
+
goattracker (2.74+dfsg1-1) unstable; urgency=medium
* debian/README.source: updated to also drop the *.exe files.
--- goattracker-2.74+dfsg1/debian/patches/cross.patch
+++ goattracker-2.74+dfsg1/debian/patches/cross.patch
@@ -0,0 +1,23 @@
+--- goattracker-2.74+dfsg1.orig/src/makefile.common
++++ goattracker-2.74+dfsg1/src/makefile.common
+@@ -41,16 +41,16 @@
+ $(CXX) -DGT2RELOC -o $@ $^ $(LIBS)
+
+ $(PREFIX)mod2sng$(SUFFIX): mod2sng.o bme/bme_end.o
+- gcc -o $@ $^
++ $(CC) -o $@ $^
+
+ $(PREFIX)ins2snd2$(SUFFIX): ins2snd2.o bme/bme_end.o
+- gcc -o $@ $^
++ $(CC) -o $@ $^
+
+ $(PREFIX)sngspli2$(SUFFIX): sngspli2.o bme/bme_end.o
+- gcc -o $@ $^
++ $(CC) -o $@ $^
+
+ $(PREFIX)betaconv$(SUFFIX): betaconv.o bme/bme_end.o
+- gcc -o $@ $^
++ $(CC) -o $@ $^
+
+ goattrk2.dat: player.s altplayer.s chargen.bin palette.bin cursor.bin
goattrk2.bmp goattrk2.seq
+ bme/datafile $@ goattrk2.seq
--- goattracker-2.74+dfsg1/debian/patches/series
+++ goattracker-2.74+dfsg1/debian/patches/series
@@ -1 +1,2 @@
makefile
+cross.patch
--- goattracker-2.74+dfsg1/debian/rules
+++ goattracker-2.74+dfsg1/debian/rules
@@ -17,8 +17,8 @@
build-stamp:
dh_testdir
- $(MAKE) -C src/bme CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)"
LDFLAGS="$(LDFLAGS)"
- $(MAKE) -C src CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)"
LDFLAGS="$(LDFLAGS)"
+ dh_auto_build --sourcedirectory=src/bme -- CFLAGS="$(CFLAGS)"
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
+ dh_auto_build --sourcedirectory=src -- CFLAGS="$(CFLAGS)"
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
touch $@
clean:
