Patchwork [1/1] make: fix invoking makeinfo failed at do_install time

login
register
mail settings
Submitter Hongxu Jia
Date April 25, 2014, 8:59 a.m.
Message ID <9f4638c7a81e5ddf79649a7611cb5317df465274.1398416012.git.hongxu.jia@windriver.com>
Download mbox | patch
Permalink /patch/70953/
State New
Headers show

Comments

Hongxu Jia - April 25, 2014, 8:59 a.m.
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>
---
 .../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
Robert Yang - April 29, 2014, 3:04 a.m.
Tested and Reviewed by Robert Yang <liezhi.yang@windriver.com>

// Robert

On 04/25/2014 04:59 PM, Hongxu Jia wrote:
> 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>
> ---
>   .../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
>
> 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 0000000..fbbff38
> --- /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 5de74e4..faf66e1 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
>

Patch

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 0000000..fbbff38
--- /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 5de74e4..faf66e1 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