diff options
| -rw-r--r-- | sys-devel/automake/ChangeLog | 16 | ||||
| -rw-r--r-- | sys-devel/automake/automake-1.4_p6.ebuild | 4 | ||||
| -rw-r--r-- | sys-devel/automake/files/1.4/00_all_ansi2knr-stdlib.patch | 11 | ||||
| -rw-r--r-- | sys-devel/automake/files/1.4/00_all_libtoolize.patch | 17 | ||||
| -rw-r--r-- | sys-devel/automake/files/1.4/00_all_subdirs-89656.patch | 22 | ||||
| -rw-r--r-- | sys-devel/automake/files/automake-1.4_p5-ignore-duplicates.patch | 29 |
6 files changed, 68 insertions, 31 deletions
diff --git a/sys-devel/automake/ChangeLog b/sys-devel/automake/ChangeLog index 9c500980365e..4de075da0e58 100644 --- a/sys-devel/automake/ChangeLog +++ b/sys-devel/automake/ChangeLog @@ -1,6 +1,20 @@ # ChangeLog for sys-devel/automake # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.65 2005/01/30 11:34:01 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.66 2005/01/30 13:26:36 vapier Exp $ + + 30 Jan 2005; Mike Frysinger <vapier@gentoo.org> + -files/automake-1.4_p5-ignore-duplicates.patch, + +files/1.4/00_all_ansi2knr-stdlib.patch, +files/1.4/00_all_libtoolize.patch, + +files/1.4/00_all_subdirs-89656.patch, automake-1.4_p6.ebuild: + Add a few patches from fedora and dont run error.test since its known to fail + and no one really cares to fix it in this old version #79529. + + 30 Jan 2005; Mike Frysinger <vapier@gentoo.org> + -files/automake-1.4_p5-ignore-duplicates.patch, + +files/1.4/00_all_ansi2knr-stdlib.patch, +files/1.4/00_all_libtoolize.patch, + +files/1.4/00_all_subdirs-89656.patch, automake-1.4_p6.ebuild: + Add a few patches from fedora and dont run error.test since its known to fail + and no one really cares to fix it in this old version #79529. 30 Jan 2005; Michael Hanselmann <hansmi@gentoo.org> automake-1.4_p6.ebuild, automake-1.5.ebuild, automake-1.6.3.ebuild, diff --git a/sys-devel/automake/automake-1.4_p6.ebuild b/sys-devel/automake/automake-1.4_p6.ebuild index 4014867cfc62..727bf10654da 100644 --- a/sys-devel/automake/automake-1.4_p6.ebuild +++ b/sys-devel/automake/automake-1.4_p6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.4_p6.ebuild,v 1.10 2005/01/30 11:34:01 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.4_p6.ebuild,v 1.11 2005/01/30 13:26:36 vapier Exp $ inherit eutils gnuconfig @@ -24,6 +24,8 @@ S="${WORKDIR}/${MY_P}" src_unpack() { unpack ${A} cd ${S} + EPATCH_SUFFIX="patch" epatch ${FILESDIR}/1.4 + sed -i 's:error\.test::' tests/Makefile.in #79529 sed -i \ -e "/^@setfilename/s|automake|automake${SLOT}|" \ -e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \ diff --git a/sys-devel/automake/files/1.4/00_all_ansi2knr-stdlib.patch b/sys-devel/automake/files/1.4/00_all_ansi2knr-stdlib.patch new file mode 100644 index 000000000000..78aa2e3d6a3f --- /dev/null +++ b/sys-devel/automake/files/1.4/00_all_ansi2knr-stdlib.patch @@ -0,0 +1,11 @@ +--- ansi2knr.c.orig 2005-01-30 06:54:09.702046352 -0500 ++++ ansi2knr.c 2005-01-30 06:54:17.719827464 -0500 +@@ -132,7 +132,7 @@ + + #endif /* not HAVE_CONFIG_H */ + +-#if STDC_HEADERS ++#if STDC_HEADERS || HAVE_STDLIB_H + # include <stdlib.h> + #else + /* diff --git a/sys-devel/automake/files/1.4/00_all_libtoolize.patch b/sys-devel/automake/files/1.4/00_all_libtoolize.patch new file mode 100644 index 000000000000..d71d66c973c5 --- /dev/null +++ b/sys-devel/automake/files/1.4/00_all_libtoolize.patch @@ -0,0 +1,17 @@ +Patch from redhat/fedora which made it into upstream. + +--- automake.in Wed Jul 12 11:40:03 2000 ++++ automake.in Thu Nov 9 07:04:46 2000 +@@ -6882,9 +6882,11 @@ + $suppress = 1; + + # Maybe run libtoolize. ++ @libtoolize_args = ('--automake'); ++ push @libtoolize_args, '-c' if $copy_missing; + if ($seen_libtool + && grep ($_ eq $file, @libtoolize_files) +- && system ('libtoolize', '--automake')) ++ && system ('libtoolize', @libtoolize_args)) + { + $message = "installing \`$errfile'"; + $suppress = 0; diff --git a/sys-devel/automake/files/1.4/00_all_subdirs-89656.patch b/sys-devel/automake/files/1.4/00_all_subdirs-89656.patch new file mode 100644 index 000000000000..7500fc98d9ac --- /dev/null +++ b/sys-devel/automake/files/1.4/00_all_subdirs-89656.patch @@ -0,0 +1,22 @@ +Patch from redhat/fedora which made it into upstream. + +--- automake-1.4-p6/subdirs.am.subdirs 2001-07-16 22:47:36.000000000 -0700 ++++ automake-1.4-p6/subdirs.am 2003-04-25 08:24:35.000000000 -0700 +@@ -27,7 +27,7 @@ + all-recursive install-data-recursive install-exec-recursive \ + installdirs-recursive install-recursive uninstall-recursive @INSTALLINFO@ \ + check-recursive installcheck-recursive info-recursive dvi-recursive: +- @set fnord $(MAKEFLAGS); amf=$$2; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -55,7 +55,7 @@ check-recursive installcheck-recursive i + ## bombs. + mostlyclean-recursive clean-recursive distclean-recursive \ + maintainer-clean-recursive: +- @set fnord $(MAKEFLAGS); amf=$$2; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ + rev="$$subdir $$rev"; \ diff --git a/sys-devel/automake/files/automake-1.4_p5-ignore-duplicates.patch b/sys-devel/automake/files/automake-1.4_p5-ignore-duplicates.patch deleted file mode 100644 index c24b30d8fce2..000000000000 --- a/sys-devel/automake/files/automake-1.4_p5-ignore-duplicates.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- aclocal Sat Jun 29 00:28:56 2002 -+++ aclocal Fri Jun 28 23:23:31 2002 -@@ -397,17 +420,18 @@ - - if (/$ac_defun_rx/) - { -- if (!defined $map{$1}) -+ if (! defined $map{$1}) - { - $map{$1} = $file; - } -- # Allow acinclude.m4 to override other macro files. -- elsif ($map{$1} ne 'acinclude.m4' || $file eq 'acinclude.m4') -- { -- warn "aclocal: $file: $.: duplicated macro \`$1'\n"; -- $exit_status = 1; -- } -- print STDERR "Found macro $1 in $file: $.\n" if $verbosity; -+ -+ # Note: we used to give an error here if we saw a -+ # duplicated macro. However, this turns out to be -+ # extremely unpopular. It causes actual problems which -+ # are hard to work around, especially when you must -+ # mix-and-match tool versions. -+ -+ print STDERR "aclocal: found macro $1 in $file: $.\n" if $verbose; - } - } - close (FILE); |