summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-04-25 08:59:36 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-29 17:31:47 +0100
commite07904836a5dc71bb68577eeb4963bc7ecde0224 (patch)
treefeece0eae3c6d85ddd33fae79f74d2411633959a /meta
parent50e9ccb2aff7b9f9dca4fda99a6832c60f64de3b (diff)
downloadpoky-e07904836a5dc71bb68577eeb4963bc7ecde0224.tar.gz
make: fix invoking makeinfo failed at do_install time
Reproduce steps: $ bitbake texinfo-native $ bitbake make $ bitbake make -cdevshell In the devshell: root:make-3.82# echo "" >> doc/make.texi root:make-3.82# ../temp/run.do_install Failed Log: ... tmp/work/i586-poky-linux/make/3.81-r1/make-3.81/doc/make.texi:8165: @itemx must follow @item ... Backport from make 4.0 to fix this issue. [YOCTO #6219] (From OE-Core rev: b191d869e86c7d4393716eee6ac27aa259d6521c) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/make/files/doc-make.texi-fix-itemx-must-follow-item.patch24
-rw-r--r--meta/recipes-devtools/make/make.inc1
2 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-devtools/make/files/doc-make.texi-fix-itemx-must-follow-item.patch b/meta/recipes-devtools/make/files/doc-make.texi-fix-itemx-must-follow-item.patch
new file mode 100644
index 0000000000..fbbff38a75
--- /dev/null
+++ b/meta/recipes-devtools/make/files/doc-make.texi-fix-itemx-must-follow-item.patch
@@ -0,0 +1,24 @@
1doc/make.texi: fix @itemx must follow @item
2
3Upstream-Status: Backport from make 4.0
4
5Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
6---
7 doc/make.texi | 2 +-
8 1 file changed, 1 insertion(+), 1 deletion(-)
9
10diff --git a/doc/make.texi b/doc/make.texi
11--- a/doc/make.texi
12+++ b/doc/make.texi
13@@ -8162,7 +8162,7 @@ from complicated nests of recursive @code{make} commands.
14 rarely need to specify this option since @samp{make} does it for you;
15 see @ref{-w Option, ,The @samp{--print-directory} Option}.)
16
17-@itemx --no-print-directory
18+@item --no-print-directory
19 @cindex @code{--no-print-directory}
20 Disable printing of the working directory under @code{-w}.
21 This option is useful when @code{-w} is turned on automatically,
22--
231.8.1.2
24
diff --git a/meta/recipes-devtools/make/make.inc b/meta/recipes-devtools/make/make.inc
index 5de74e4261..faf66e1b90 100644
--- a/meta/recipes-devtools/make/make.inc
+++ b/meta/recipes-devtools/make/make.inc
@@ -6,6 +6,7 @@ HOMEPAGE = "http://www.gnu.org/software/make/"
6SECTION = "devel" 6SECTION = "devel"
7 7
8SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2 \ 8SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2 \
9 file://doc-make.texi-fix-itemx-must-follow-item.patch \
9 file://SCCS.patch" 10 file://SCCS.patch"
10 11
11inherit autotools gettext 12inherit autotools gettext