diff -Nru gprolog-1.4.5/debian/changelog gprolog-1.4.5/debian/changelog --- gprolog-1.4.5/debian/changelog 2016-12-11 00:16:43.000000000 +0000 +++ gprolog-1.4.5/debian/changelog 2017-02-05 10:30:08.000000000 +0000 @@ -1,3 +1,11 @@ +gprolog (1.4.5-4.1) unstable; urgency=medium + + * Non-maintainer upload. + * Build with gcc 6 on i386, workaround the FTBFS by using + --disable-regs on i386. (Closes: #852008) + + -- Adrian Bunk Sun, 05 Feb 2017 12:30:08 +0200 + gprolog (1.4.5-4) unstable; urgency=medium * lintian-motivated fixes: diff -Nru gprolog-1.4.5/debian/control gprolog-1.4.5/debian/control --- gprolog-1.4.5/debian/control 2016-12-08 13:13:30.000000000 +0000 +++ gprolog-1.4.5/debian/control 2017-02-05 10:30:08.000000000 +0000 @@ -2,8 +2,7 @@ Section: devel Priority: optional Maintainer: Salvador Abreu -Build-Depends: debhelper (>= 9), autoconf (>= 2.52), gcc (>> 5) - [!i386], gcc-5 [i386], autotools-dev +Build-Depends: debhelper (>= 9), autoconf (>= 2.52), autotools-dev Build-Depends-Indep: imagemagick, gsfonts, texlive-latex-recommended, texlive-latex-extra, texlive-font-utils, hevea (>= 1.09) Standards-Version: 3.9.8 diff -Nru gprolog-1.4.5/debian/rules gprolog-1.4.5/debian/rules --- gprolog-1.4.5/debian/rules 2016-12-09 16:25:20.000000000 +0000 +++ gprolog-1.4.5/debian/rules 2017-02-05 10:30:08.000000000 +0000 @@ -27,6 +27,12 @@ BCFLAGS=-funsigned-char export LDFLAGS=-no-pie +REGS = --enable-regs +# FTBFS workaround (#852008) +ifneq ($(filter $(DEB_TARGET_ARCH), i386),) + REGS = --disable-regs +endif + # ============================================================================= CPPFLAGS = \ @@ -43,7 +49,7 @@ --with-examples-dir=$(DOCDIR)/examples \ --without-links \ --disable-ebp \ - --enable-regs \ + $(REGS) \ --with-c-flags="$(DBGFLAGS) $(BCFLAGS) -Wall $(CPPFLAGS)" @@ -63,12 +69,7 @@ SRCXPATH := $(shell echo $(SRCXPATH) | tr -d ' ') PATH = $(SRCXPATH):/usr/bin:/bin PL_PATH = ${CURDIR}/src - -ifeq ($(DEB_TARGET_ARCH),i386) - CC = gcc-5 -else - CC = gcc -endif +CC = gcc # == build binaries and documentation =========================================