summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/libtool/libtool-2.4.2.inc4
-rw-r--r--meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch24
-rw-r--r--meta/recipes-devtools/libtool/libtool/prefix-manpage-fix.patch21
3 files changed, 26 insertions, 23 deletions
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.2.inc b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
index 12a783a17d..bb4ddf0084 100644
--- a/meta/recipes-devtools/libtool/libtool-2.4.2.inc
+++ b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
@@ -8,11 +8,10 @@ LICENSE = "GPLv2 & LGPLv2.1"
8LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ 8LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
9 file://libltdl/COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" 9 file://libltdl/COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06"
10 10
11INC_PR = "r5" 11INC_PR = "r6"
12 12
13SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ 13SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
14 file://trailingslash.patch \ 14 file://trailingslash.patch \
15 file://prefix-manpage-fix.patch \
16 file://rename-with-sysroot.patch \ 15 file://rename-with-sysroot.patch \
17 file://use-sysroot-in-libpath.patch \ 16 file://use-sysroot-in-libpath.patch \
18 file://fix-final-rpath.patch \ 17 file://fix-final-rpath.patch \
@@ -20,6 +19,7 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
20 file://fix-rpath.patch \ 19 file://fix-rpath.patch \
21 file://respect-fstack-protector.patch \ 20 file://respect-fstack-protector.patch \
22 file://norm-rpath.patch \ 21 file://norm-rpath.patch \
22 file://dont-depend-on-help2man.patch \
23 " 23 "
24 24
25SRC_URI[md5sum] = "d2f3b7d4627e69e13514a40e72a24d50" 25SRC_URI[md5sum] = "d2f3b7d4627e69e13514a40e72a24d50"
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 @@
1Upstream-Status: Inappropriate
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -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 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3For cross environment, it not possible to run the generated executable.
4nstead use the build version of libtool to generate the man pages.
5
6Date: 2010/07/09
7Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
8
9Index: 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