[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#900144: djtools FTCBFS: uses the build architecture compiler



Source: djtools
Version: 1.2.7
Tags: patch
User: helmutg@debian.org
Usertags: rebootstrap

djtools fails to cross build from source, because it uses the build
architecture compiler. Letting dh_auto_build pass cross tools to make
mostly fixes this except for one bare gcc invocation in
hptools/Makefile. After making that substitutable, djtools cross builds
successfully. Please consider applying the attached patch.

Helmut
diff --minimal -Nru djtools-1.2.7/debian/changelog djtools-1.2.7+nmu1/debian/changelog
--- djtools-1.2.7/debian/changelog	2011-12-12 21:12:19.000000000 +0100
+++ djtools-1.2.7+nmu1/debian/changelog	2018-05-26 21:23:37.000000000 +0200
@@ -1,3 +1,12 @@
+djtools (1.2.7+nmu1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
+    + Let dh_auto_build pass cross tools to make.
+    + Make gcc substitutable in hptools/Makefile.
+
+ -- Helmut Grohne <helmut@subdivi.de>  Sat, 26 May 2018 21:23:37 +0200
+
 djtools (1.2.7) unstable; urgency=low
 
   * QA upload.
diff --minimal -Nru djtools-1.2.7/debian/rules djtools-1.2.7+nmu1/debian/rules
--- djtools-1.2.7/debian/rules	2011-12-12 20:50:55.000000000 +0100
+++ djtools-1.2.7+nmu1/debian/rules	2018-05-26 21:23:34.000000000 +0200
@@ -9,8 +9,8 @@
 	dh_clean
 
 override_dh_auto_build:
-	$(MAKE) -C djscript CFLAGS="-O2 -Wall -DDEFAULT_PRT_NAME=\\\"-\\\""
-	$(MAKE) -C hptools	
+	dh_auto_build --sourcedirectory=djscript -- CFLAGS="-O2 -Wall -DDEFAULT_PRT_NAME=\\\"-\\\""
+	dh_auto_build --sourcedirectory=hptools
 
 override_dh_installdocs:
 	install djscript/README $(CURDIR)/debian/djtools/usr/share/doc/djtools/djscript.README
diff --minimal -Nru djtools-1.2.7/hptools/Makefile djtools-1.2.7+nmu1/hptools/Makefile
--- djtools-1.2.7/hptools/Makefile	1999-12-19 22:59:10.000000000 +0100
+++ djtools-1.2.7+nmu1/hptools/Makefile	2018-05-26 21:23:37.000000000 +0200
@@ -11,7 +11,7 @@
 
 hpset: hp.c
 
-	gcc hp.c -o hpset -O3 -DDEVICE=$(DEVICE)
+	$(CC) hp.c -o hpset -O3 -DDEVICE=$(DEVICE)
 
 
 all: hpset

Reply to: