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:47:42 +0000 |
commit | 51a97cfb96ee2e5eeef978678fe6acdd498b9555 (patch) | |
tree | b2eb13654c2f99c914edf69189035ee02352fd1e /meta/recipes-devtools/libtool/libtool | |
parent | cff5f9494f5bbb0df00ba8733d5356d381dde14b (diff) | |
download | openembedded-core-contrib-51a97cfb96ee2e5eeef978678fe6acdd498b9555.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
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 @@ +Upstream-Status: Inappropriate + +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> +diff -Nurd libtool-2.4.2/Makefile.am libtool-2.4.2/Makefile.am +--- libtool-2.4.2/Makefile.am 2011-10-17 13:17:04.000000000 +0300 ++++ libtool-2.4.2/Makefile.am 2013-01-01 22:03:36.865586811 +0200 +@@ -327,17 +327,6 @@ + cd $(srcdir)/doc && \ + $(MAKEINFO) --no-headers $(MAKEINFOFLAGS) -o notes.txt notes.texi + +-dist_man1_MANS = $(srcdir)/doc/libtool.1 $(srcdir)/doc/libtoolize.1 +-MAINTAINERCLEANFILES += $(dist_man1_MANS) +-update_mans = \ +- PATH=".$(PATH_SEPARATOR)$$PATH"; export PATH; \ +- $(HELP2MAN) --output=$@ +-$(srcdir)/doc/libtool.1: $(srcdir)/$(auxdir)/ltmain.sh +- $(update_mans) --help-option=--help-all libtool +-$(srcdir)/doc/libtoolize.1: $(srcdir)/libtoolize.in +- $(update_mans) libtoolize +- +- + ## ------------- ## + ## Installation. ## + ## ------------- ## 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 @@ -Upstream-Status: Inappropriate [embedded specific] - -For cross environment, it not possible to run the generated executable. -nstead use the build version of libtool to generate the man pages. - -Date: 2010/07/09 -Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> - -Index: libtool-2.4.2/Makefile.am -=================================================================== ---- libtool-2.4.2.orig/Makefile.am -+++ libtool-2.4.2/Makefile.am -@@ -333,7 +333,7 @@ update_mans = \ - PATH=".$(PATH_SEPARATOR)$$PATH"; export PATH; \ - $(HELP2MAN) --output=$@ - $(srcdir)/doc/libtool.1: $(srcdir)/$(auxdir)/ltmain.sh -- $(update_mans) --help-option=--help-all libtool -+ $(update_mans) --help-option=--help-all ${build_alias}-libtool - $(srcdir)/doc/libtoolize.1: $(srcdir)/libtoolize.in - $(update_mans) libtoolize - |