From a9c49dd5c71b4f9fd45936d3b7c9c3892835846e Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 20 Mar 2008 12:53:01 +0000 Subject: automake: upgraded to 1.10 git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4101 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/automake/automake-native_1.10.bb | 1 + meta/packages/automake/automake-native_1.9.6.bb | 3 -- meta/packages/automake/automake_1.10.bb | 29 ++++++++++++ meta/packages/automake/automake_1.9.6.bb | 29 ------------ meta/packages/automake/files/path_prog_fixes.patch | 53 +++++++++++++--------- 5 files changed, 62 insertions(+), 53 deletions(-) create mode 100644 meta/packages/automake/automake-native_1.10.bb delete mode 100644 meta/packages/automake/automake-native_1.9.6.bb create mode 100644 meta/packages/automake/automake_1.10.bb delete mode 100644 meta/packages/automake/automake_1.9.6.bb (limited to 'meta') diff --git a/meta/packages/automake/automake-native_1.10.bb b/meta/packages/automake/automake-native_1.10.bb new file mode 100644 index 000000000..8fc754e82 --- /dev/null +++ b/meta/packages/automake/automake-native_1.10.bb @@ -0,0 +1 @@ +require automake-native.inc diff --git a/meta/packages/automake/automake-native_1.9.6.bb b/meta/packages/automake/automake-native_1.9.6.bb deleted file mode 100644 index 92c861f49..000000000 --- a/meta/packages/automake/automake-native_1.9.6.bb +++ /dev/null @@ -1,3 +0,0 @@ -PV := "${PV}" - -require automake-native.inc diff --git a/meta/packages/automake/automake_1.10.bb b/meta/packages/automake/automake_1.10.bb new file mode 100644 index 000000000..1235c1096 --- /dev/null +++ b/meta/packages/automake/automake_1.10.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "A tool for automatically generating Makefiles." +LICENSE = "GPL" +HOMEPAGE = "http://www.gnu.org/software/automake/" +SECTION = "devel" + +SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \ + ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}" + +S = "${WORKDIR}/automake-${PV}" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}" + +inherit autotools + +export AUTOMAKE = "${@bb.which('automake', bb.data.getVar('PATH', d, 1))}" +FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*" + +require automake.inc + +do_install () { + oe_runmake 'DESTDIR=${D}' install + install -d ${D}${datadir} + if [ ! -e ${D}${datadir}/aclocal ]; then + ln -sf aclocal-1.9 ${D}${datadir}/aclocal + fi + if [ ! -e ${D}${datadir}/automake ]; then + ln -sf automake-1.9 ${D}${datadir}/automake + fi +} diff --git a/meta/packages/automake/automake_1.9.6.bb b/meta/packages/automake/automake_1.9.6.bb deleted file mode 100644 index 1235c1096..000000000 --- a/meta/packages/automake/automake_1.9.6.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "A tool for automatically generating Makefiles." -LICENSE = "GPL" -HOMEPAGE = "http://www.gnu.org/software/automake/" -SECTION = "devel" - -SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \ - ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}" - -S = "${WORKDIR}/automake-${PV}" - -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}" - -inherit autotools - -export AUTOMAKE = "${@bb.which('automake', bb.data.getVar('PATH', d, 1))}" -FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*" - -require automake.inc - -do_install () { - oe_runmake 'DESTDIR=${D}' install - install -d ${D}${datadir} - if [ ! -e ${D}${datadir}/aclocal ]; then - ln -sf aclocal-1.9 ${D}${datadir}/aclocal - fi - if [ ! -e ${D}${datadir}/automake ]; then - ln -sf automake-1.9 ${D}${datadir}/automake - fi -} diff --git a/meta/packages/automake/files/path_prog_fixes.patch b/meta/packages/automake/files/path_prog_fixes.patch index a85b24420..32e190e24 100644 --- a/meta/packages/automake/files/path_prog_fixes.patch +++ b/meta/packages/automake/files/path_prog_fixes.patch @@ -1,8 +1,15 @@ -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:47:38.241364016 -0500 -@@ -66,7 +66,8 @@ +--- + Makefile.am | 3 ++- + Makefile.in | 3 ++- + aclocal.in | 4 ++-- + automake.in | 6 ++++-- + 4 files changed, 10 insertions(+), 6 deletions(-) + +--- automake-1.10.orig/Makefile.am ++++ automake-1.10/Makefile.am +@@ -73,11 +73,12 @@ do_subst = sed \ + -e 's,[@]PATH_SEPARATOR[@],$(PATH_SEPARATOR),g' \ + -e 's,[@]PERL[@],$(PERL),g' \ -e 's,[@]SHELL[@],$(SHELL),g' \ -e 's,[@]VERSION[@],$(VERSION),g' \ -e 's,[@]configure_input[@],Generated from $@.in; do not edit by hand.,g' \ @@ -12,11 +19,13 @@ 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 @@ + ## Use chmod a-w to prevent people from editing the wrong file by accident. + automake: automake.in +--- automake-1.10.orig/Makefile.in ++++ automake-1.10/Makefile.in +@@ -183,11 +183,12 @@ do_subst = sed \ + -e 's,[@]PATH_SEPARATOR[@],$(PATH_SEPARATOR),g' \ + -e 's,[@]PERL[@],$(PERL),g' \ -e 's,[@]SHELL[@],$(SHELL),g' \ -e 's,[@]VERSION[@],$(VERSION),g' \ -e 's,[@]configure_input[@],Generated from $@.in; do not edit by hand.,g' \ @@ -26,12 +35,12 @@ Index: automake-1.9.3/Makefile.in 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:47:38.241364016 -0500 -@@ -1,8 +1,8 @@ --#!@PERL@ + FETCHFILES = \ + INSTALL \ +--- automake-1.10.orig/aclocal.in ++++ automake-1.10/aclocal.in +@@ -1,10 +1,10 @@ +-#!@PERL@ -w +#!@bindir@/env perl # -*- perl -*- # @configure_input@ @@ -41,11 +50,11 @@ Index: automake-1.9.3/aclocal.in if 0; # aclocal - create aclocal.m4 by scanning configure.ac -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:47:38.245363408 -0500 -@@ -1,8 +1,10 @@ + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +--- automake-1.10.orig/automake.in ++++ automake-1.10/automake.in +@@ -1,10 +1,12 @@ -#!@PERL@ -w +#!@bindir@/env perl # -*- perl -*- @@ -58,3 +67,5 @@ Index: automake-1.9.3/automake.in if 0; # automake - create Makefile.in from Makefile.am + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -- cgit v1.2.3