diff options
| author |   Hongxu Jia <hongxu.jia@windriver.com> | 2014-04-25 08:59:36 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-29 17:31:28 +0100 |
| commit | b191d869e86c7d4393716eee6ac27aa259d6521c (patch) | |
| tree | 4d6b4c2575ee668f000d814527ad872a3981506f | |
| parent | 97bc1bce9a226cc02db8a5afc2c0d4f4f70034a6 (diff) | |
| download | openembedded-core-contrib-b191d869e86c7d4393716eee6ac27aa259d6521c.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]
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>
| -rw-r--r-- | meta/recipes-devtools/make/files/doc-make.texi-fix-itemx-must-follow-item.patch | 24 | ||||
| -rw-r--r-- | meta/recipes-devtools/make/make.inc | 1 |
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 @@ +doc/make.texi: fix @itemx must follow @item + +Upstream-Status: Backport from make 4.0 + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + doc/make.texi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/make.texi b/doc/make.texi +--- a/doc/make.texi ++++ b/doc/make.texi +@@ -8162,7 +8162,7 @@ from complicated nests of recursive @code{make} commands. + rarely need to specify this option since @samp{make} does it for you; + see @ref{-w Option, ,The @samp{--print-directory} Option}.) + +-@itemx --no-print-directory ++@item --no-print-directory + @cindex @code{--no-print-directory} + Disable printing of the working directory under @code{-w}. + This option is useful when @code{-w} is turned on automatically, +-- +1.8.1.2 + 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/" SECTION = "devel" SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2 \ + file://doc-make.texi-fix-itemx-must-follow-item.patch \ file://SCCS.patch" inherit autotools gettext |