summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-29 09:45:24 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-30 10:10:34 +0100
commit8feed9d4129ae810b04c88d2f635f83c2c511158 (patch)
tree68ab58724f813899f503bcacd889a21142f681d3 /meta
parentc565d76ce15dd11fc8c4e8caeb2184f6865c6692 (diff)
downloadpoky-8feed9d4129ae810b04c88d2f635f83c2c511158.tar.gz
make-3.81: Fix build failures with newer makeinfo
(From OE-Core rev: f81925316323b662f9b4d368976f4205fb96dc67) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/make/make-3.81/makeinfo.patch22
-rw-r--r--meta/recipes-devtools/make/make_3.81.bb1
2 files changed, 23 insertions, 0 deletions
diff --git a/meta/recipes-devtools/make/make-3.81/makeinfo.patch b/meta/recipes-devtools/make/make-3.81/makeinfo.patch
new file mode 100644
index 0000000000..5dd7604675
--- /dev/null
+++ b/meta/recipes-devtools/make/make-3.81/makeinfo.patch
@@ -0,0 +1,22 @@
1Allow docs to build with makeinfo 5.X, fixing the error:
2
3doc/make.texi:8165: @itemx must follow @item
4
5Upstream-Status: Backport
6
7RP
82014/03/29
9
10Index: make-3.81/doc/make.texi
11===================================================================
12--- make-3.81.orig/doc/make.texi 2006-04-01 06:36:40.000000000 +0000
13+++ make-3.81/doc/make.texi 2014-03-29 09:39:51.007727012 +0000
14@@ -8162,7 +8162,7 @@
15 rarely need to specify this option since @samp{make} does it for you;
16 see @ref{-w Option, ,The @samp{--print-directory} Option}.)
17
18-@itemx --no-print-directory
19+@item --no-print-directory
20 @cindex @code{--no-print-directory}
21 Disable printing of the working directory under @code{-w}.
22 This option is useful when @code{-w} is turned on automatically,
diff --git a/meta/recipes-devtools/make/make_3.81.bb b/meta/recipes-devtools/make/make_3.81.bb
index 45ab6caddc..b8a79b0eb2 100644
--- a/meta/recipes-devtools/make/make_3.81.bb
+++ b/meta/recipes-devtools/make/make_3.81.bb
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \
8require make.inc 8require make.inc
9 9
10SRC_URI += "file://make_fix_for_automake-1.12.patch" 10SRC_URI += "file://make_fix_for_automake-1.12.patch"
11SRC_URI += "file://makeinfo.patch"
11 12
12SRC_URI[md5sum] = "354853e0b2da90c527e35aabb8d6f1e6" 13SRC_URI[md5sum] = "354853e0b2da90c527e35aabb8d6f1e6"
13SRC_URI[sha256sum] = "f3e69023771e23908f5d5592954d8271d3d6af09693cecfd29cee6fde8550dc8" 14SRC_URI[sha256sum] = "f3e69023771e23908f5d5592954d8271d3d6af09693cecfd29cee6fde8550dc8"