summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2013-02-26 13:39:24 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-28 23:15:49 +0000
commit68ddf00775513e39fd69ad4c9b6ef2bb620ca823 (patch)
treeffc8b8cf5022fe70592adf7a2ff366b78787bc64 /meta/recipes-devtools
parentf55f60569be2dfd2e0d76ecd0bc7d61d46cef2b7 (diff)
downloadpoky-68ddf00775513e39fd69ad4c9b6ef2bb620ca823.tar.gz
binutils: Fix build with newer texinfo 5.0+
[Yocto #3943] (From OE-Core rev: 79a378a47e9a87c42337a846317b556e16e89664) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.23.1.inc4
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-doc-binutils.texi-elfedit-Fix-use-of-itemx-in-table.patch68
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-ld.texinfo-Replace-with-when-it-is-part-of-the-text.patch196
-rw-r--r--meta/recipes-devtools/binutils/binutils-crosssdk_2.23.1.bb3
4 files changed, 268 insertions, 3 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.23.1.inc b/meta/recipes-devtools/binutils/binutils-2.23.1.inc
index 33969813af..15811d7830 100644
--- a/meta/recipes-devtools/binutils/binutils-2.23.1.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.23.1.inc
@@ -1,3 +1,5 @@
1PR = "r2"
2
1LIC_FILES_CHKSUM="\ 3LIC_FILES_CHKSUM="\
2 file://src-release;endline=17;md5=4830a9ef968f3b18dd5e9f2c00db2d35\ 4 file://src-release;endline=17;md5=4830a9ef968f3b18dd5e9f2c00db2d35\
3 file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552\ 5 file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552\
@@ -40,6 +42,8 @@ BACKPORT = "\
40 file://backport/0018-bfd.patch \ 42 file://backport/0018-bfd.patch \
41 file://backport/0024-bfd.patch \ 43 file://backport/0024-bfd.patch \
42 file://backport/0026-ld-testsuite.patch \ 44 file://backport/0026-ld-testsuite.patch \
45 file://backport/0001-doc-binutils.texi-elfedit-Fix-use-of-itemx-in-table.patch \
46 file://backport/0001-ld.texinfo-Replace-with-when-it-is-part-of-the-text.patch \
43" 47"
44SRC_URI[md5sum] = "33adb18c3048d057ac58d07a3f1adb38" 48SRC_URI[md5sum] = "33adb18c3048d057ac58d07a3f1adb38"
45SRC_URI[sha256sum] = "2ab2e5b03e086d12c6295f831adad46b3e1410a3a234933a2e8fac66cb2e7a19" 49SRC_URI[sha256sum] = "2ab2e5b03e086d12c6295f831adad46b3e1410a3a234933a2e8fac66cb2e7a19"
diff --git a/meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-doc-binutils.texi-elfedit-Fix-use-of-itemx-in-table.patch b/meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-doc-binutils.texi-elfedit-Fix-use-of-itemx-in-table.patch
new file mode 100644
index 0000000000..97a40a2a42
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-doc-binutils.texi-elfedit-Fix-use-of-itemx-in-table.patch
@@ -0,0 +1,68 @@
1From e02bf9359f6ef7fe4d341aa5ac4f397f541b9ac3 Mon Sep 17 00:00:00 2001
2From: Andreas Schwab <schwab@linux-m68k.org>
3Date: Fri, 4 Jan 2013 22:27:57 +0000
4Subject: [PATCH] * doc/binutils.texi (elfedit): Fix use of @itemx in @table.
5
6---
7 binutils/ChangeLog | 4 ++++
8 binutils/doc/binutils.texi | 14 +++++++-------
9 2 files changed, 11 insertions(+), 7 deletions(-)
10
11Upstream-Status: Backport
12Index: binutils-2.23.1/binutils/doc/binutils.texi
13===================================================================
14--- binutils-2.23.1.orig/binutils/doc/binutils.texi 2012-05-11 11:18:34.000000000 -0700
15+++ binutils-2.23.1/binutils/doc/binutils.texi 2013-02-26 12:41:51.785114224 -0800
16@@ -12,7 +12,7 @@
17 @c man begin COPYRIGHT
18 Copyright @copyright{} 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
19 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
20-2010, 2011, 2012
21+2010, 2011, 2012, 2013
22 Free Software Foundation, Inc.
23
24 Permission is granted to copy, distribute and/or modify this document
25@@ -4375,7 +4375,7 @@
26
27 @table @env
28
29-@itemx --input-mach=@var{machine}
30+@item --input-mach=@var{machine}
31 Set the matching input ELF machine type to @var{machine}. If
32 @option{--input-mach} isn't specified, it will match any ELF
33 machine types.
34@@ -4383,21 +4383,21 @@
35 The supported ELF machine types are, @var{L1OM}, @var{K1OM} and
36 @var{x86-64}.
37
38-@itemx --output-mach=@var{machine}
39+@item --output-mach=@var{machine}
40 Change the ELF machine type in the ELF header to @var{machine}. The
41 supported ELF machine types are the same as @option{--input-mach}.
42
43-@itemx --input-type=@var{type}
44+@item --input-type=@var{type}
45 Set the matching input ELF file type to @var{type}. If
46 @option{--input-type} isn't specified, it will match any ELF file types.
47
48 The supported ELF file types are, @var{rel}, @var{exec} and @var{dyn}.
49
50-@itemx --output-type=@var{type}
51+@item --output-type=@var{type}
52 Change the ELF file type in the ELF header to @var{type}. The
53 supported ELF types are the same as @option{--input-type}.
54
55-@itemx --input-osabi=@var{osabi}
56+@item --input-osabi=@var{osabi}
57 Set the matching input ELF file OSABI to @var{osabi}. If
58 @option{--input-osabi} isn't specified, it will match any ELF OSABIs.
59
60@@ -4407,7 +4407,7 @@
61 @var{FreeBSD}, @var{TRU64}, @var{Modesto}, @var{OpenBSD}, @var{OpenVMS},
62 @var{NSK}, @var{AROS} and @var{FenixOS}.
63
64-@itemx --output-osabi=@var{osabi}
65+@item --output-osabi=@var{osabi}
66 Change the ELF OSABI in the ELF header to @var{osabi}. The
67 supported ELF OSABI are the same as @option{--input-osabi}.
68
diff --git a/meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-ld.texinfo-Replace-with-when-it-is-part-of-the-text.patch b/meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-ld.texinfo-Replace-with-when-it-is-part-of-the-text.patch
new file mode 100644
index 0000000000..83d27d35bb
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-ld.texinfo-Replace-with-when-it-is-part-of-the-text.patch
@@ -0,0 +1,196 @@
1From 935f85422863b42b6fbca30885885e3fa28eea36 Mon Sep 17 00:00:00 2001
2From: Nick Clifton <nickc@redhat.com>
3Date: Mon, 7 Jan 2013 12:11:11 +0000
4Subject: [PATCH] * ld.texinfo: Replace @ with @@ when it is part of
5 the text. Correct ordering of M68HC11 entry.
6
7 * doc/binutils.texi: Fix ordering of top level nodes.
8 Replace erroneous uses of @itemx with @item.
9
10 * bfd.texinfo: Replace @ with @@ when it is part of the text.
11---
12 bfd/doc/ChangeLog | 4 ++++
13 bfd/doc/bfd.texinfo | 12 +++++++-----
14 binutils/ChangeLog | 5 +++++
15 binutils/doc/binutils.texi | 8 ++++----
16 ld/ChangeLog | 5 +++++
17 ld/ld.texinfo | 26 ++++++++++++++------------
18 6 files changed, 39 insertions(+), 21 deletions(-)
19
20
21Upstream-Status: Backport
22Index: binutils-2.23.1/bfd/doc/bfd.texinfo
23===================================================================
24--- binutils-2.23.1.orig/bfd/doc/bfd.texinfo 2010-10-28 04:40:25.000000000 -0700
25+++ binutils-2.23.1/bfd/doc/bfd.texinfo 2013-02-26 12:42:26.909115020 -0800
26@@ -1,7 +1,7 @@
27 \input texinfo.tex
28 @setfilename bfd.info
29 @c Copyright 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1997, 2000,
30-@c 2001, 2002, 2003, 2006, 2007, 2008, 2009
31+@c 2001, 2002, 2003, 2006, 2007, 2008, 2009, 2013
32 @c Free Software Foundation, Inc.
33 @c
34 @synindex fn cp
35@@ -16,7 +16,8 @@
36 @copying
37 This file documents the BFD library.
38
39-Copyright @copyright{} 1991, 2000, 2001, 2003, 2006, 2007, 2008 Free Software Foundation, Inc.
40+Copyright @copyright{} 1991, 2000, 2001, 2003, 2006, 2007, 2008, 2013
41+Free Software Foundation, Inc.
42
43 Permission is granted to copy, distribute and/or modify this document
44 under the terms of the GNU Free Documentation License, Version 1.3 or
45@@ -64,7 +65,8 @@
46 @end tex
47
48 @vskip 0pt plus 1filll
49-Copyright @copyright{} 1991, 2001, 2003, 2006, 2008 Free Software Foundation, Inc.
50+Copyright @copyright{} 1991, 2001, 2003, 2006, 2008, 2013
51+Free Software Foundation, Inc.
52
53 Permission is granted to copy, distribute and/or modify this document
54 under the terms of the GNU Free Documentation License, Version 1.3
55@@ -322,7 +324,7 @@
56 @printindex cp
57
58 @tex
59-% I think something like @colophon should be in texinfo. In the
60+% I think something like @@colophon should be in texinfo. In the
61 % meantime:
62 \long\def\colophon{\hbox to0pt{}\vfill
63 \centerline{The body of this manual is set in}
64@@ -333,7 +335,7 @@
65 \centerline{{\sl\fontname\tensl\/}}
66 \centerline{are used for emphasis.}\vfill}
67 \page\colophon
68-% Blame: doc@cygnus.com, 28mar91.
69+% Blame: doc@@cygnus.com, 28mar91.
70 @end tex
71
72 @bye
73Index: binutils-2.23.1/binutils/doc/binutils.texi
74===================================================================
75--- binutils-2.23.1.orig/binutils/doc/binutils.texi 2013-02-26 12:41:51.000000000 -0800
76+++ binutils-2.23.1/binutils/doc/binutils.texi 2013-02-26 12:42:26.913115010 -0800
77@@ -148,18 +148,18 @@
78 * objcopy:: Copy and translate object files
79 * objdump:: Display information from object files
80 * ranlib:: Generate index to archive contents
81-* readelf:: Display the contents of ELF format files
82 * size:: List section sizes and total size
83 * strings:: List printable strings from files
84 * strip:: Discard symbols
85-* elfedit:: Update the ELF header of ELF files
86 * c++filt:: Filter to demangle encoded C++ symbols
87 * cxxfilt: c++filt. MS-DOS name for c++filt
88 * addr2line:: Convert addresses to file and line
89 * nlmconv:: Converts object code into an NLM
90-* windres:: Manipulate Windows resources
91 * windmc:: Generator for Windows message resources
92+* windres:: Manipulate Windows resources
93 * dlltool:: Create files needed to build and use DLLs
94+* readelf:: Display the contents of ELF format files
95+* elfedit:: Update the ELF header of ELF files
96 * Common Options:: Command-line options for all utilities
97 * Selecting the Target System:: How these utilities determine the target
98 * Reporting Bugs:: Reporting Bugs
99@@ -2898,7 +2898,7 @@
100 @c man end
101 @end ignore
102
103-@node c++filt, addr2line, elfedit, Top
104+@node c++filt, addr2line, strip, Top
105 @chapter c++filt
106
107 @kindex c++filt
108Index: binutils-2.23.1/ld/ld.texinfo
109===================================================================
110--- binutils-2.23.1.orig/ld/ld.texinfo 2013-02-19 14:26:56.571782665 -0800
111+++ binutils-2.23.1/ld/ld.texinfo 2013-02-26 12:45:20.677119476 -0800
112@@ -1,7 +1,8 @@
113 \input texinfo
114 @setfilename ld.info
115 @c Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
116-@c 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
117+@c 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
118+@c 2012, 2013
119 @c Free Software Foundation, Inc.
120 @syncodeindex ky cp
121 @c man begin INCLUDE
122@@ -55,7 +56,8 @@
123 version @value{VERSION}.
124
125 Copyright @copyright{} 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
126-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
127+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012, 2013
128+Free Software Foundation, Inc.
129
130 Permission is granted to copy, distribute and/or modify this document
131 under the terms of the GNU Free Documentation License, Version 1.3
132@@ -93,8 +95,8 @@
133 @vskip 0pt plus 1filll
134 @c man begin COPYRIGHT
135 Copyright @copyright{} 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
136-1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free
137-Software Foundation, Inc.
138+1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
139+2012, 2013 Free Software Foundation, Inc.
140
141 Permission is granted to copy, distribute and/or modify this document
142 under the terms of the GNU Free Documentation License, Version 1.3
143@@ -142,12 +144,12 @@
144 @ifset ARM
145 * ARM:: ld and the ARM family
146 @end ifset
147-@ifset HPPA
148-* HPPA ELF32:: ld and HPPA 32-bit ELF
149-@end ifset
150 @ifset M68HC11
151 * M68HC11/68HC12:: ld and the Motorola 68HC11 and 68HC12 families
152 @end ifset
153+@ifset HPPA
154+* HPPA ELF32:: ld and HPPA 32-bit ELF
155+@end ifset
156 @ifset M68K
157 * M68K:: ld and Motorola 68K family
158 @end ifset
159@@ -6003,6 +6005,9 @@
160 @ifset I960
161 * i960:: @command{ld} and the Intel 960 family
162 @end ifset
163+@ifset M68HC11
164+* M68HC11/68HC12:: @code{ld} and the Motorola 68HC11 and 68HC12 families
165+@end ifset
166 @ifset ARM
167 * ARM:: @command{ld} and the ARM family
168 @end ifset
169@@ -6018,9 +6023,6 @@
170 @ifset MSP430
171 * MSP430:: @command{ld} and MSP430
172 @end ifset
173-@ifset M68HC11
174-* M68HC11/68HC12:: @code{ld} and the Motorola 68HC11 and 68HC12 families
175-@end ifset
176 @ifset POWERPC
177 * PowerPC ELF32:: @command{ld} and PowerPC 32-bit ELF Support
178 @end ifset
179@@ -7868,7 +7870,7 @@
180 @printindex cp
181
182 @tex
183-% I think something like @colophon should be in texinfo. In the
184+% I think something like @@colophon should be in texinfo. In the
185 % meantime:
186 \long\def\colophon{\hbox to0pt{}\vfill
187 \centerline{The body of this manual is set in}
188@@ -7879,7 +7881,7 @@
189 \centerline{{\sl\fontname\tensl\/}}
190 \centerline{are used for emphasis.}\vfill}
191 \page\colophon
192-% Blame: doc@cygnus.com, 28mar91.
193+% Blame: doc@@cygnus.com, 28mar91.
194 @end tex
195
196 @bye
diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.23.1.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.23.1.bb
index c93654992a..8af407f6e0 100644
--- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.23.1.bb
+++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.23.1.bb
@@ -2,11 +2,8 @@ require binutils-cross_${PV}.bb
2 2
3inherit crosssdk 3inherit crosssdk
4 4
5PR = "r1"
6
7PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk" 5PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk"
8 6
9
10SRC_URI += "file://relocatable_sdk.patch" 7SRC_URI += "file://relocatable_sdk.patch"
11 8
12do_configure_prepend () { 9do_configure_prepend () {