diff options
| -rw-r--r-- | packages/automake/automake_1.7.7.bb | 2 | ||||
| -rw-r--r-- | packages/automake/automake_1.8.2.bb | 2 | ||||
| -rw-r--r-- | packages/automake/automake_1.8.4.bb | 2 | ||||
| -rw-r--r-- | packages/automake/automake_1.9.2.bb | 2 | ||||
| -rw-r--r-- | packages/automake/automake_1.9.3.bb | 1 | ||||
| -rw-r--r-- | packages/automake/files/path_prog_fixes.patch | 20 |
6 files changed, 22 insertions, 7 deletions
diff --git a/packages/automake/automake_1.7.7.bb b/packages/automake/automake_1.7.7.bb index 1ec1b06df0..f5362e0c72 100644 --- a/packages/automake/automake_1.7.7.bb +++ b/packages/automake/automake_1.7.7.bb @@ -3,7 +3,7 @@ SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \ DESCRIPTION = "A tool for automatically generating Makefiles." SECTION = "devel" LICENSE = "GPL" -PR = "r5" +PR = "r6" inherit autotools FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*" diff --git a/packages/automake/automake_1.8.2.bb b/packages/automake/automake_1.8.2.bb index 3b3f39c16b..cc9163998d 100644 --- a/packages/automake/automake_1.8.2.bb +++ b/packages/automake/automake_1.8.2.bb @@ -4,7 +4,7 @@ SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \ DESCRIPTION = "A tool for automatically generating Makefiles." SECTION = "devel" LICENSE = "GPL" -PR = "r5" +PR = "r6" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}" diff --git a/packages/automake/automake_1.8.4.bb b/packages/automake/automake_1.8.4.bb index d68538f4b7..f5ca24aace 100644 --- a/packages/automake/automake_1.8.4.bb +++ b/packages/automake/automake_1.8.4.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A tool for automatically generating Makefiles." LICENSE = "GPL" HOMEPAGE = "http://www.gnu.org/software/automake/" SECTION = "devel" -PR = "r5" +PR = "r6" SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \ file://path_prog_fixes.patch;patch=1" diff --git a/packages/automake/automake_1.9.2.bb b/packages/automake/automake_1.9.2.bb index 266b70b74c..a34e2e287b 100644 --- a/packages/automake/automake_1.9.2.bb +++ b/packages/automake/automake_1.9.2.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A tool for automatically generating Makefiles." LICENSE = "GPL" HOMEPAGE = "http://www.gnu.org/software/automake/" SECTION = "devel" -PR = "r5" +PR = "r6" SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \ file://path_prog_fixes.patch;patch=1" diff --git a/packages/automake/automake_1.9.3.bb b/packages/automake/automake_1.9.3.bb index cd262e7f6e..bde8418257 100644 --- a/packages/automake/automake_1.9.3.bb +++ b/packages/automake/automake_1.9.3.bb @@ -13,6 +13,7 @@ DEFAULT_PREFERENCE = "-1" inherit autotools +export AUTOMAKE = "${@bb.which('automake', bb.data.getVar('PATH', d, 1))}" FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*" RDEPENDS_${PN} += "autoconf perl" diff --git a/packages/automake/files/path_prog_fixes.patch b/packages/automake/files/path_prog_fixes.patch index 21ba1dde71..a85b244205 100644 --- a/packages/automake/files/path_prog_fixes.patch +++ b/packages/automake/files/path_prog_fixes.patch @@ -1,7 +1,7 @@ Index: automake-1.9.3/Makefile.am =================================================================== --- automake-1.9.3.orig/Makefile.am 2004-10-25 14:57:30.000000000 -0400 -+++ automake-1.9.3/Makefile.am 2005-03-09 16:37:26.378381328 -0500 ++++ automake-1.9.3/Makefile.am 2005-03-09 16:47:38.241364016 -0500 @@ -66,7 +66,8 @@ -e 's,[@]SHELL[@],$(SHELL),g' \ -e 's,[@]VERSION[@],$(VERSION),g' \ @@ -12,10 +12,24 @@ Index: automake-1.9.3/Makefile.am ## These files depend on Makefile so they are rebuilt if $(VERSION), ## $(datadir) or other do_subst'ituted variables change. +Index: automake-1.9.3/Makefile.in +=================================================================== +--- automake-1.9.3.orig/Makefile.in 2004-11-01 05:23:54.000000000 -0500 ++++ automake-1.9.3/Makefile.in 2005-03-09 16:47:54.712859968 -0500 +@@ -161,7 +161,8 @@ + -e 's,[@]SHELL[@],$(SHELL),g' \ + -e 's,[@]VERSION[@],$(VERSION),g' \ + -e 's,[@]configure_input[@],Generated from $@.in; do not edit by hand.,g' \ +- -e 's,[@]datadir[@],$(datadir),g' ++ -e 's,[@]datadir[@],$(datadir),g' \ ++ -e 's,[@]bindir[@],$(bindir),g' + + WGET = wget + WGETSGO = $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~ Index: automake-1.9.3/aclocal.in =================================================================== --- automake-1.9.3.orig/aclocal.in 2004-10-10 12:10:24.000000000 -0400 -+++ automake-1.9.3/aclocal.in 2005-03-09 16:35:22.082277208 -0500 ++++ automake-1.9.3/aclocal.in 2005-03-09 16:47:38.241364016 -0500 @@ -1,8 +1,8 @@ -#!@PERL@ +#!@bindir@/env perl @@ -30,7 +44,7 @@ Index: automake-1.9.3/aclocal.in Index: automake-1.9.3/automake.in =================================================================== --- automake-1.9.3.orig/automake.in 2004-10-21 16:23:26.000000000 -0400 -+++ automake-1.9.3/automake.in 2005-03-09 16:35:22.086276600 -0500 ++++ automake-1.9.3/automake.in 2005-03-09 16:47:38.245363408 -0500 @@ -1,8 +1,10 @@ -#!@PERL@ -w +#!@bindir@/env perl |