Source: typespeed Version: 0.6.5-2.1 Tags: patch User: [email protected] Usertags: rebootstrap
typespeed fails to cross build from source, because it does not pass the relevant --host flag to ./configure. Using dh_auto_configure fixes that. Still it fails, because the upstream build system fails to propagate the cross compiler from configure to make. After removing the erroneous assignments, it cross builds. Please consider applying the attached patch. Also please consider rebuilding Makefile.in from Makefile.am during build. Helmut
diff -u typespeed-0.6.5/debian/changelog typespeed-0.6.5/debian/changelog --- typespeed-0.6.5/debian/changelog +++ typespeed-0.6.5/debian/changelog @@ -1,3 +1,12 @@ +typespeed (0.6.5-2.2) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix FTCBFS: (Closes: #-1) + + Let dh_auto_configure pass --host to ./configure. + + 0003-cross.patch: Propagate CC from configure to make. + + -- Helmut Grohne <[email protected]> Mon, 26 Mar 2018 17:04:24 +0200 + typespeed (0.6.5-2.1) unstable; urgency=medium * Non-maintainer upload. diff -u typespeed-0.6.5/debian/control typespeed-0.6.5/debian/control --- typespeed-0.6.5/debian/control +++ typespeed-0.6.5/debian/control @@ -1,5 +1,5 @@ Source: typespeed -Build-Depends: debhelper (>= 5), quilt (>= 0.46-7), libncurses5-dev, autotools-dev +Build-Depends: debhelper (>= 7), quilt (>= 0.46-7), libncurses5-dev, autotools-dev Section: games Priority: optional Maintainer: Dafydd Harries <[email protected]> diff -u typespeed-0.6.5/debian/patches/series typespeed-0.6.5/debian/patches/series --- typespeed-0.6.5/debian/patches/series +++ typespeed-0.6.5/debian/patches/series @@ -1,0 +2 @@ +0003-cross.patch diff -u typespeed-0.6.5/debian/rules typespeed-0.6.5/debian/rules --- typespeed-0.6.5/debian/rules +++ typespeed-0.6.5/debian/rules @@ -16,8 +16,7 @@ config.log: patch dh_autotools-dev_updateconfig - ./configure --prefix=/usr --bindir=/usr/games --localstatedir=/var \ - --sysconfdir=/etc + dh_auto_configure -- --bindir=/usr/games debian/build-stamp: config.log dh_testdir only in patch2: unchanged: --- typespeed-0.6.5.orig/.pc/.quilt_patches +++ typespeed-0.6.5/.pc/.quilt_patches @@ -0,0 +1 @@ +./debian/patches only in patch2: unchanged: --- typespeed-0.6.5.orig/.pc/.quilt_series +++ typespeed-0.6.5/.pc/.quilt_series @@ -0,0 +1 @@ +series only in patch2: unchanged: --- typespeed-0.6.5.orig/.pc/.version +++ typespeed-0.6.5/.pc/.version @@ -0,0 +1 @@ +2 only in patch2: unchanged: --- typespeed-0.6.5.orig/debian/patches/0003-cross.patch +++ typespeed-0.6.5/debian/patches/0003-cross.patch @@ -0,0 +1,44 @@ +Index: typespeed-0.6.5/src/Makefile.am +=================================================================== +--- typespeed-0.6.5.orig/src/Makefile.am ++++ typespeed-0.6.5/src/Makefile.am +@@ -1,4 +1,3 @@ +-CC = gcc + AM_CFLAGS = -Wall -W -pedantic -std=c99 + + HIGHFILE = typespeed.score +Index: typespeed-0.6.5/src/Makefile.in +=================================================================== +--- typespeed-0.6.5.orig/src/Makefile.in ++++ typespeed-0.6.5/src/Makefile.in +@@ -85,7 +85,7 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-CC = gcc ++CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ +Index: typespeed-0.6.5/testsuite/Makefile.am +=================================================================== +--- typespeed-0.6.5.orig/testsuite/Makefile.am ++++ typespeed-0.6.5/testsuite/Makefile.am +@@ -1,4 +1,3 @@ +-CC = gcc + AM_CFLAGS = -I../src -Wall -W -pedantic -std=c99 + + localedir = $(datadir)/locale +Index: typespeed-0.6.5/testsuite/Makefile.in +=================================================================== +--- typespeed-0.6.5.orig/testsuite/Makefile.in ++++ typespeed-0.6.5/testsuite/Makefile.in +@@ -98,7 +98,7 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-CC = gcc ++CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@
