mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-01 06:32:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

libtool: remove help2man dependency

Browse Source 
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>
This commit is contained in:
Marko Lindqvist
2013-01-07 01:49:28 +02:00
committed by Richard Purdie
parent c12a97360f
commit efcb4facc6
3 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
meta/recipes-devtools/libtool/libtool-2.4.2.inc
View File

@@ -8,11 +8,10 @@ LICENSE = "GPLv2 & LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://libltdl/COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06"
INC_PR = "r5"
INC_PR = "r6"
SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
file://trailingslash.patch \
file://prefix-manpage-fix.patch \
file://rename-with-sysroot.patch \
file://use-sysroot-in-libpath.patch \
file://fix-final-rpath.patch \
@@ -20,6 +19,7 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
file://fix-rpath.patch \
file://respect-fstack-protector.patch \
file://norm-rpath.patch \
file://dont-depend-on-help2man.patch \
"
SRC_URI[md5sum] = "d2f3b7d4627e69e13514a40e72a24d50"

24
meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch Normal file
View File

@@ -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. ##
## ------------- ##

21
meta/recipes-devtools/libtool/libtool/prefix-manpage-fix.patch
View File

@@ -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