From: Marko Lindqvist <cazfi74@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH v2 02/15] libtool: remove help2man dependency
Date: Mon, 7 Jan 2013 01:49:28 +0200 [thread overview]
Message-ID: <1357516181-5358-3-git-send-email-cazfi74@gmail.com> (raw)
In-Reply-To: <1357516181-5358-2-git-send-email-cazfi74@gmail.com>
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>
---
meta/recipes-devtools/libtool/libtool-2.4.2.inc | 4 ++--
.../libtool/libtool/dont-depend-on-help2man.patch | 24 ++++++++++++++++++++
.../libtool/libtool/prefix-manpage-fix.patch | 21 -----------------
3 files changed, 26 insertions(+), 23 deletions(-)
create mode 100644 meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch
delete mode 100644 meta/recipes-devtools/libtool/libtool/prefix-manpage-fix.patch
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.2.inc b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
index 12a783a..bb4ddf0 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"
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"
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 0000000..67552b0
--- /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 879778c..0000000
--- 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
-
--
1.7.10.4
next prev parent reply other threads:[~2013-01-07 0:05 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-06 23:49 Prepare recipes for automake-1.13 (batch 1 / v2) Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 01/15] pkg-config: replace obsolete automake macros with working ones Marko Lindqvist
2013-01-06 23:49 ` Marko Lindqvist [this message]
2013-01-06 23:49 ` [PATCH v2 03/15] bison: remove help2man dependency Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 04/15] file: replace obsolete automake macros with working ones Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 05/15] popt: disable tests Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 06/15] glib-2.0: replace obsolete automake macros with working ones Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 07/15] libx11: disable tests Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 08/15] libpng: replace obsolete automake macros with working ones Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 09/15] libusb: " Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 10/15] pixman: " Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 11/15] libid3tag: " Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 12/15] libgcrypt: " Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 13/15] gnutls: " Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 14/15] libtasn1: remove help2man dependency Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 15/15] flac: replace obsolete automake macros with working ones Marko Lindqvist
2013-01-07 11:59 ` [PATCH v2 04/15] file: " Richard Purdie
2013-01-07 12:11 ` Marko Lindqvist
2013-01-07 12:16 ` Burton, Ross
2013-01-07 12:18 ` Otavio Salvador
2013-01-07 13:46 ` Richard Purdie
2013-01-07 15:58 ` Otavio Salvador
2013-01-07 16:26 ` Marko Lindqvist
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1357516181-5358-3-git-send-email-cazfi74@gmail.com \
--to=cazfi74@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox