make: fix invoking makeinfo failed at do_install time
cover make: fix invoking makeinfo failed at do_install time
The following changes since commit 50e9ccb2aff7b9f9dca4fda99a6832c60f64de3b:
bitbake: bitbake: fetch2/git: Anchor names when using ls-remote (2014-04-19 11:04:48 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib hongxu/fix-dora-make
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-dora-make
Hongxu Jia (1):
make: fix invoking makeinfo failed at do_install time
.../doc-make.texi-fix-itemx-must-follow-item.patch | 24 ++++++++++++++++++++++ meta/recipes-devtools/make/make.inc | 1 + 2 files changed, 25 insertions(+) create mode 100644 meta/recipes-devtools/make/files/doc-make.texi-fix-itemx-must-follow-item.patch
Signature · 1 line
1.8.1.2
PATCH 1/1 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]
--- .../doc-make.texi-fix-itemx-must-follow-item.patch | 24 ++++++++++++++++++++++ meta/recipes-devtools/make/make.inc | 1 + 2 files changed, 25 insertions(+) create mode 100644 meta/recipes-devtools/make/files/doc-make.texi-fix-itemx-must-follow-item.patch
meta/recipes-devtools/make/files/doc-make.texi-fix-itemx-must-follow-item.patch new file +24 -0
@@ -0,0 +1,24 @@ +doc/make.texi: fix @itemx must follow @item + +Upstream-Status: Backport from make 4.0 + +Signed-off-by: Hongxu Jia <[email protected]> +--- + 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 +
meta/recipes-devtools/make/make.inc +1 -0
@@ -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
Signature · 1 line
1.8.1.2
Tested and Reviewed by Robert Yang <[email protected]>
// Robert
Quoted 67 lines · Hongxu Jia
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_installFailed 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 <[email protected]>--- .../doc-make.texi-fix-itemx-must-follow-item.patch | 24 ++++++++++++++++++++++ meta/recipes-devtools/make/make.inc | 1 + 2 files changed, 25 insertions(+)create mode 100644
meta/recipes-devtools/make/files/doc-make.texi-fix-itemx-must-follow-item.patchmeta/recipes-devtools/make/files/doc-make.texi-fix-itemx-must-follow-item.patch new file +24
-0@@ -0,0 +1,24 @@ +doc/make.texi: fix @itemx must follow @item + +Upstream-Status: Backport from make 4.0 + +Signed-off-by: Hongxu Jia <[email protected]> +--- + 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 +meta/recipes-devtools/make/make.inc +1
-0@@ -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