Control: tag -1 + patch On Mon, 07 Aug 2017 11:50:33 -0400, Lucas Nussbaum wrote:
> Source: fftw
> Version: 2.1.5-4.1
> Severity: serious
> Tags: buster sid
> User: debian...@lists.debian.org
> Usertags: qa-ftbfs-20170807 qa-ftbfs
> Justification: FTBFS on amd64
>
> Hi,
>
> During a rebuild of all packages in sid, your package failed to build on
> amd64.
>
> Relevant part (hopefully):
> > make[1]: Entering directory '/<<PKGBUILDDIR>>/doc'
> > perl texi2html -split_chapter -no_toc_href fftw.texi
> > Unescaped left brace in regex is deprecated here (and will be fatal in Perl
> > 5.30), passed through in regex; marked by <-- HERE in m/\@(\w+){ <-- HERE
> > ([^\{\}]+)}/ at texi2html line 1771.
> > Unescaped left brace in regex is illegal here in regex; marked by <-- HERE
> > in m/\@value{ <-- HERE ([^\s\{\}]+)}/ at texi2html line 842, <FH001> line 4.
> > Makefile:799: recipe for target 'html' failed
> > make[1]: *** [html] Error 25
Here's yet another patch for texi2html.
(And a bonus feature to make testing the build easier.)
Cheers,
gregor
--
.''`. https://info.comodo.priv.at/ - Debian Developer https://www.debian.org
: :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D 85FA BB3A 6801 8649 AA06
`. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
`-
diff -Nru fftw-2.1.5/debian/changelog fftw-2.1.5/debian/changelog --- fftw-2.1.5/debian/changelog 2016-09-18 08:15:51.000000000 -0400 +++ fftw-2.1.5/debian/changelog 2017-08-07 18:39:10.000000000 -0400 @@ -1,3 +1,14 @@ +fftw (2.1.5-4.2) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix "FTBFS: Unescaped left brace in regex is deprecated here": + add patch fix-texi2html-perl526.patch to fix Perl 5.26 regexp + warnings/errors. + (Closes: #871367) + * Add support for DEB_BUILD_OPTIONS=nocheck in debian/rules. + + -- gregor herrmann <gre...@debian.org> Mon, 07 Aug 2017 18:39:10 -0400 + fftw (2.1.5-4.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru fftw-2.1.5/debian/patches/fix-texi2html-perl526.patch fftw-2.1.5/debian/patches/fix-texi2html-perl526.patch --- fftw-2.1.5/debian/patches/fix-texi2html-perl526.patch 1969-12-31 19:00:00.000000000 -0500 +++ fftw-2.1.5/debian/patches/fix-texi2html-perl526.patch 2017-08-07 18:39:10.000000000 -0400 @@ -0,0 +1,35 @@ +Description: Fix perl 5.26 regexp warnings/errors +Origin: vendor +Bug-Debian: https://bugs.debian.org/871367 +Author: gregor herrmann <gre...@debian.org> +Last-Update: 2017-08-07 + +--- a/doc/texi2html ++++ b/doc/texi2html +@@ -839,7 +839,7 @@ + s/\@refill\s+//g; + # other substitutions + &simple_substitutions; +- s/\@value{($VARRE)}/$value{$1}/eg; ++ s/\@value\{($VARRE)}/$value{$1}/eg; + s/\@footnote\{/\@footnote$docu_doc\{/g; # mark footnotes, cf. pass 4 + # + # analyze the tag again +@@ -1169,7 +1169,7 @@ + # + # xref + # +- while (/\@(x|px|info|)ref{($XREFRE)(}?)/o) { ++ while (/\@(x|px|info|)ref\{($XREFRE)(}?)/o) { + # note: Texinfo may accept other characters + ($type, $nodes, $full) = ($1, $2, $3); + ($before, $after) = ($`, $'); +@@ -1768,7 +1768,7 @@ + while ($changed) { + $changed = 0; + $done = ''; +- while (/\@(\w+){([^\{\}]+)}/) { ++ while (/\@(\w+)\{([^\{\}]+)}/) { + $text = &apply_style($1, $2); + if ($text) { + $_ = "$`$text$'"; diff -Nru fftw-2.1.5/debian/patches/series fftw-2.1.5/debian/patches/series --- fftw-2.1.5/debian/patches/series 2016-09-18 08:06:40.000000000 -0400 +++ fftw-2.1.5/debian/patches/series 2017-08-07 18:39:10.000000000 -0400 @@ -5,3 +5,4 @@ info-syntax fix-texi2html-perl522.patch perl-cwd-in-inc.patch +fix-texi2html-perl526.patch diff -Nru fftw-2.1.5/debian/rules fftw-2.1.5/debian/rules --- fftw-2.1.5/debian/rules 2016-07-11 15:59:11.000000000 -0400 +++ fftw-2.1.5/debian/rules 2017-08-07 18:39:10.000000000 -0400 @@ -30,17 +30,21 @@ # single precision F77=gfortran CFLAGS="$(CFLAGS)" CC=mpicc ./configure $(CONFFLAGS) --enable-float --enable-type-prefix $(ARCHCONFFLAGS) $(MAKE) +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) #$(MAKE) -C tests check ./tests/fftw_test -t -e -v -p 1024 -x 1 ./tests/rfftw_test -t -e -v -p 1024 -x 1 +endif $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp-single $(MAKE) clean # double precision F77=gfortran CFLAGS="$(CFLAGS)" CC=mpicc ./configure $(CONFFLAGS) $(ARCHCONFFLAGS) $(MAKE) +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) #$(MAKE) -C tests check ./tests/fftw_test -t -e -v -p 1024 -x 1 ./tests/rfftw_test -t -e -v -p 1024 -x 1 +endif $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp-double touch build-arch-stamp
signature.asc
Description: Digital Signature
