Update libtool-2.4 recipe to work with autoconf-1.13

* liberate requirement on automake from 1.11 to generic, as there's hope
  that any automake equal or newer than 1.11 will do
* add patch for removing dependency to help2man which is being invoked
  to regenerate the manpages, which won't work and has become an error
  with automake-1.13
* move patches for 2.4 into a corresponding subfolder
* explictly list patches
This commit is contained in:
Oliver Tappe
2013-04-24 00:20:27 +02:00
parent 428759c831
commit c849f5886d
3 changed files with 32 additions and 1 deletions

View File

@@ -9,6 +9,11 @@ CHECKSUM_MD5="b32b04148ecdd7344abc6fe8bd1bb021"
REVISION="5"
ARCHITECTURES="x86_gcc2 ?x86"
PATCHES="
2.4/adjust_config_for_packaging.patch
2.4/remove_help2man_dependency.patch
"
PROVIDES="
libtool = $portVersion compat >= 2.4
cmd:libtool = $portVersion compat >= 2.4
@@ -25,7 +30,7 @@ REQUIRES="
"
BUILD_REQUIRES="
cmd:autoconf >= 2.62
cmd:aclocal >= 1.13
cmd:aclocal
cmd:autoheader >= 2.62
cmd:sed
"

View File

@@ -1,3 +1,5 @@
Adjust haiku configuration of upstream libtool for packaging.
diff -ur libtool-2.4/libltdl/m4/libtool.m4 libtool-2.4/libltdl/m4/libtool.m4
--- libtool-2.4/libltdl/m4/libtool.m4 2010-09-22 08:41:19.064749568 +0000
+++ libtool-2.4/libltdl/m4/libtool.m4 2011-07-24 16:58:02.885260288 +0000

View File

@@ -0,0 +1,24 @@
Remove dependency to help2man, which tries to regenerate the manpages.
As the failure to use help2man has become an error with automake-1.13,
we just use the manpages that come with the source.
diff -ruwN libtool-2.4/Makefile.am libtool-2.4_haiku/Makefile.am
--- libtool-2.4/Makefile.am 2010-09-21 09:07:22.038535168 +0200
+++ libtool-2.4_haiku/Makefile.am 2013-04-23 23:41:18.886833152 +0200
@@ -322,16 +322,6 @@
$(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. ##
## ------------- ##