aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-01-06 14:47:37 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-23 11:35:24 +0000
commit871dc461b1dfc431c0c95743af1624b781262bce (patch)
treeef4bdfc1be6a11b7e339709c77b16b125cd67418 /meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch
parent455edf38e8af854de0cffffdebf258b354ff7e54 (diff)
downloadopenembedded-core-contrib-871dc461b1dfc431c0c95743af1624b781262bce.tar.gz
libtool: upgraded to 2.4.4
* Upgrade: - libtool-native - libtool-cross - nativesdk-libtool - libtool * Remove 2 patches: - respect-fstack-protector.patch: already in the new source. - avoid_absolute_paths_for_general_utils.patch: no general.m4sh any more. - Use inline-source to install libtoolize. * Update other patches * The LIC_FILES_CHKSUM is changed because of the indent, the contents are the same. * The libtool config files are put in libtool/build-aux now, it was libtool/config in the past. Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Diffstat (limited to 'meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch')
-rw-r--r--meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch32
1 files changed, 19 insertions, 13 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
index 67552b0ff5..fd4084c859 100644
--- a/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch
+++ b/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch
@@ -1,24 +1,30 @@
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
+Updated by: Robert Yang <liezhi.yang@windriver.com>
--dist_man1_MANS = $(srcdir)/doc/libtool.1 $(srcdir)/doc/libtoolize.1
+diff --git a/Makefile.am b/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -404,21 +404,6 @@ $(notes_txt): $(notes_texi)
+ $(AM_V_GEN)$(MAKEINFO) -P '$(srcdir)/doc' --no-headers \
+ $(MAKEINFOFLAGS) -o '$@' '$(notes_texi)'
+
+-dist_man1_MANS = $(libtool_1) $(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
+- $(HELP2MAN) --output='$@'
-
+-# It's wrong to make distributed files (e.g. $(libtool_1)) rely on
+-# files created in the build tree, so instead we regenerate the
+-# manual pages if the sources for the build-tree files we want to
+-# run have changed.
+-$(libtool_1): $(ltmain_sh)
+- $(AM_V_GEN)$(update_mans) --help-option=--help-all libtool
+-$(libtoolize_1): $(libtoolize_in)
+- $(AM_V_GEN)$(update_mans) libtoolize
-
+
## ------------- ##
## Installation. ##
- ## ------------- ##