Bug#704586: binutils: FTBFS with texinfo 5

2013-04-13 Thread Alberto Garcia
On Wed, Apr 03, 2013 at 12:34:05PM +0300, Alberto Garcia wrote:

> This seems to be the upstream bug report:

It turns out that there are more build problems related to texinfo
than the one that I already mentioned.

All of them have been fixed upstream in different patches (some of
them even reverting changes made by others) so I decided to create
a single patch combining all the necessary changes to make binutils
compile.

I tried this patch both with texinfo 4 and 5 and binutils builds fine
with both versions.

Berto
From: Alberto Garcia 
Bug-Debian: http://bugs.debian.org/704586
Description: Fix FTBFS with texinfo 5
 This patch combines changes from the following commits from the
 upstream git repository: baf8679, 935f854, f0fa19a and 2cfdb6d, by
 Nick Clifton and Andreas Schwab.

Index: binutils-2.23.2/ld/ld.texinfo
===
--- binutils-2.23.2.orig/ld/ld.texinfo	2013-04-13 01:43:52.518562215 +0300
+++ binutils-2.23.2/ld/ld.texinfo	2013-04-13 01:43:52.602562470 +0300
@@ -7864,7 +7864,7 @@
 @printindex cp
 
 @tex
-% I think something like @colophon should be in texinfo.  In the
+% I think something like @@colophon should be in texinfo.  In the
 % meantime:
 \long\def\colophon{\hbox to0pt{}\vfill
 \centerline{The body of this manual is set in}
@@ -7875,7 +7875,7 @@
 \centerline{{\sl\fontname\tensl\/}}
 \centerline{are used for emphasis.}\vfill}
 \page\colophon
-% Blame: d...@cygnus.com, 28mar91.
+% Blame: doc@@cygnus.com, 28mar91.
 @end tex
 
 @bye
Index: binutils-2.23.2/gas/doc/c-arc.texi
===
--- binutils-2.23.2.orig/gas/doc/c-arc.texi	2011-01-18 15:37:39.0 +0200
+++ binutils-2.23.2/gas/doc/c-arc.texi	2013-04-13 01:49:07.503520205 +0300
@@ -220,7 +220,7 @@
 encodings for use of these instructions according to the specification
 by the user.  The parameters are:
 
-@table @bullet
+@itemize @bullet
 @item @var{name}
 Name of the extension instruction 
 
@@ -279,7 +279,7 @@
 with SYNTAX_20P.
 
 @end itemize 
-@end table
+@end itemize
 
 For example, defining 64-bit multiplier with immediate operands:
 
Index: binutils-2.23.2/gas/doc/c-arm.texi
===
--- binutils-2.23.2.orig/gas/doc/c-arm.texi	2013-03-25 10:06:21.0 +0200
+++ binutils-2.23.2/gas/doc/c-arm.texi	2013-04-13 01:43:52.602562470 +0300
@@ -390,7 +390,7 @@
 @code{unified} syntax, which can be selected via the @code{.syntax}
 directive, and has the following main features:
 
-@table @bullet
+@itemize @bullet
 @item
 Immediate operands do not require a @code{#} prefix.
 
@@ -415,7 +415,7 @@
 @item
 All instructions set the flags if and only if they have an @code{s}
 affix.
-@end table
+@end itemize
 
 @node ARM-Chars
 @subsection Special Characters
@@ -451,28 +451,6 @@
 @cindex register names, ARM
 *TODO* Explain about ARM register naming, and the predefined names.
 
-@node ARM-Neon-Alignment
-@subsection NEON Alignment Specifiers
-
-@cindex alignment for NEON instructions
-Some NEON load/store instructions allow an optional address
-alignment qualifier.
-The ARM documentation specifies that this is indicated by
-@samp{@@ @var{align}}. However GAS already interprets
-the @samp{@@} character as a "line comment" start,
-so @samp{: @var{align}} is used instead.  For example:
-
-@smallexample
-vld1.8 @{q0@}, [r0, :128]
-@end smallexample
-
-@node ARM Floating Point
-@section Floating Point
-
-@cindex floating point, ARM (@sc{ieee})
-@cindex ARM floating point (@sc{ieee})
-The ARM family uses @sc{ieee} floating-point numbers.
-
 @node ARM-Relocations
 @subsection ARM relocation generation
 
@@ -519,6 +497,28 @@
 MOVT r0, #:upper16:foo
 @end smallexample
 
+@node ARM-Neon-Alignment
+@subsection NEON Alignment Specifiers
+
+@cindex alignment for NEON instructions
+Some NEON load/store instructions allow an optional address
+alignment qualifier.
+The ARM documentation specifies that this is indicated by
+@samp{@@ @var{align}}. However GAS already interprets
+the @samp{@@} character as a "line comment" start,
+so @samp{: @var{align}} is used instead.  For example:
+
+@smallexample
+vld1.8 @{q0@}, [r0, :128]
+@end smallexample
+
+@node ARM Floating Point
+@section Floating Point
+
+@cindex floating point, ARM (@sc{ieee})
+@cindex ARM floating point (@sc{ieee})
+The ARM family uses @sc{ieee} floating-point numbers.
+
 @node ARM Directives
 @section ARM Machine Directives
 
Index: binutils-2.23.2/gas/doc/c-mips.texi
===
--- binutils-2.23.2.orig/gas/doc/c-mips.texi	2012-09-04 17:16:07.0 +0300
+++ binutils-2.23.2/gas/doc/c-mips.texi	2013-04-13 01:43:52.602562470 +0300
@@ -234,7 +234,7 @@
 instructions around accesses to the @samp{HI} and @samp{LO} registers.
 @samp{-no-m4650} turns off this option.
 
-@itemx -m3900
+@item -m3900
 @itemx -no-m3900
 @itemx -m4100
 @itemx -no

Bug#704586: binutils: FTBFS with texinfo 5

2013-04-03 Thread Alberto Garcia
Source: binutils
Version: 2.23.2-1
Severity: normal

binutils 2.23.2-1 FTBFS with texinfo 5 from experimental (reproduced
with 5.1.dfsg.1-1).

This seems to be the upstream bug report:

   http://sourceware.org/bugzilla/show_bug.cgi?id=15183

And here's the compilation output:

make[5]: Entering directory `/tmp/binutils-2.23.2/builddir-single/ld'
restore=: && backupdir=".am$$" && \
rm -rf $backupdir && mkdir $backupdir && \
if (makeinfo --split-size=500 --split-size=500 --version) 
>/dev/null 2>&1; then \
  for f in ld.info ld.info-[0-9] ld.info-[0-9][0-9] ld.i[0-9] 
ld.i[0-9][0-9]; do \
if test -f $f; then mv $f $backupdir; restore=mv; else :; fi; \
  done; \
else :; fi && \
if makeinfo --split-size=500 --split-size=500 -I ../../ld -I 
../../ld/../bfd/doc -I ../bfd/doc -I ../../ld/../libiberty  -I ../../ld \
 -o ld.info `test -f 'ld.texinfo' || echo
 -'../../ld/'`ld.texinfo; \
then \
  rc=0; \
else \
  rc=$?; \
  $restore $backupdir/* `echo "./ld.info" | sed 's|[^/]*$||'`; \
fi; \
rm -rf $backupdir; exit $rc
../../ld/ld.texinfo:7867: unknown command `colophon'
../../ld/ld.texinfo:7878: unknown command `cygnus'
../../ld/ld.texinfo:6111: warning: node next `i960' in menu `ARM' and in 
sectioning `M68HC11/68HC12' differ
../../ld/ld.texinfo:6184: warning: node next `M68HC11/68HC12' in menu `PowerPC 
ELF32' and in sectioning `ARM' differ
../../ld/ld.texinfo:6184: warning: node prev `M68HC11/68HC12' in menu `MSP430' 
and in sectioning `i960' differ
../../ld/ld.texinfo:6230: warning: node prev `ARM' in menu `i960' and in 
sectioning `M68HC11/68HC12' differ
../../ld/ld.texinfo:6542: warning: node next `MSP430' in menu `M68HC11/68HC12' 
and in sectioning `PowerPC ELF32' differ
../../ld/ld.texinfo:6583: warning: node prev `PowerPC ELF32' in menu 
`M68HC11/68HC12' and in sectioning `MSP430' differ
make[5]: *** [ld.info] Error 1
make[5]: Leaving directory `/tmp/binutils-2.23.2/builddir-single/ld'
make[4]: *** [all-recursive] Error 1
make[4]: Leaving directory `/tmp/binutils-2.23.2/builddir-single/ld'
make[3]: *** [all] Error 2
make[3]: Leaving directory `/tmp/binutils-2.23.2/builddir-single/ld'
make[2]: *** [all-ld] Error 2
make[2]: Leaving directory `/tmp/binutils-2.23.2/builddir-single'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/tmp/binutils-2.23.2/builddir-single'
make: *** [build-single-stamp] Error 2
dpkg-buildpackage: error: debian/rules build gave error exit status 2

-- System Information:
Debian Release: 7.0
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-- no debconf information


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org