diff options
author | Marko Lindqvist <cazfi74@gmail.com> | 2013-01-07 01:49:28 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-07 13:50:40 +0000 |
commit | efcb4facc683e5c40c1ae30f99037150f7827b37 (patch) | |
tree | 51d12dfee31b60a4b2592e22af7030d3f90730f0 /meta/recipes-devtools/libtool/libtool | |
parent | c12a97360f006f6c09c2c7bf9e867a9d5dd43b0a (diff) | |
download | poky-efcb4facc683e5c40c1ae30f99037150f7827b37.tar.gz |
libtool: remove help2man dependency
Remove manpage creation. It wasn't working because of help2man
missing when libtool is being built. This attempt to create
manpages without help2man turns from no-op to hard error with
automake-1.13.
Removed prefix-manpage-fix.patch as only code it touched is being
removed by new dont-depend-on-help2man.patch
(From OE-Core rev: 51a97cfb96ee2e5eeef978678fe6acdd498b9555)
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/libtool/libtool')
-rw-r--r-- | meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch | 24 | ||||
-rw-r--r-- | meta/recipes-devtools/libtool/libtool/prefix-manpage-fix.patch | 21 |
2 files changed, 24 insertions, 21 deletions
diff --git a/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch b/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch new file mode 100644 index 0000000000..67552b0ff5 --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | Upstream-Status: Inappropriate | ||
2 | |||
3 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
4 | diff -Nurd libtool-2.4.2/Makefile.am libtool-2.4.2/Makefile.am | ||
5 | --- libtool-2.4.2/Makefile.am 2011-10-17 13:17:04.000000000 +0300 | ||
6 | +++ libtool-2.4.2/Makefile.am 2013-01-01 22:03:36.865586811 +0200 | ||
7 | @@ -327,17 +327,6 @@ | ||
8 | cd $(srcdir)/doc && \ | ||
9 | $(MAKEINFO) --no-headers $(MAKEINFOFLAGS) -o notes.txt notes.texi | ||
10 | |||
11 | -dist_man1_MANS = $(srcdir)/doc/libtool.1 $(srcdir)/doc/libtoolize.1 | ||
12 | -MAINTAINERCLEANFILES += $(dist_man1_MANS) | ||
13 | -update_mans = \ | ||
14 | - PATH=".$(PATH_SEPARATOR)$$PATH"; export PATH; \ | ||
15 | - $(HELP2MAN) --output=$@ | ||
16 | -$(srcdir)/doc/libtool.1: $(srcdir)/$(auxdir)/ltmain.sh | ||
17 | - $(update_mans) --help-option=--help-all libtool | ||
18 | -$(srcdir)/doc/libtoolize.1: $(srcdir)/libtoolize.in | ||
19 | - $(update_mans) libtoolize | ||
20 | - | ||
21 | - | ||
22 | ## ------------- ## | ||
23 | ## Installation. ## | ||
24 | ## ------------- ## | ||
diff --git a/meta/recipes-devtools/libtool/libtool/prefix-manpage-fix.patch b/meta/recipes-devtools/libtool/libtool/prefix-manpage-fix.patch deleted file mode 100644 index 879778c719..0000000000 --- a/meta/recipes-devtools/libtool/libtool/prefix-manpage-fix.patch +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | For cross environment, it not possible to run the generated executable. | ||
4 | nstead use the build version of libtool to generate the man pages. | ||
5 | |||
6 | Date: 2010/07/09 | ||
7 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
8 | |||
9 | Index: libtool-2.4.2/Makefile.am | ||
10 | =================================================================== | ||
11 | --- libtool-2.4.2.orig/Makefile.am | ||
12 | +++ libtool-2.4.2/Makefile.am | ||
13 | @@ -333,7 +333,7 @@ update_mans = \ | ||
14 | PATH=".$(PATH_SEPARATOR)$$PATH"; export PATH; \ | ||
15 | $(HELP2MAN) --output=$@ | ||
16 | $(srcdir)/doc/libtool.1: $(srcdir)/$(auxdir)/ltmain.sh | ||
17 | - $(update_mans) --help-option=--help-all libtool | ||
18 | + $(update_mans) --help-option=--help-all ${build_alias}-libtool | ||
19 | $(srcdir)/doc/libtoolize.1: $(srcdir)/libtoolize.in | ||
20 | $(update_mans) libtoolize | ||
21 | |||