From 08f4cc94d64ced5ead1b6bd7cbcf6d71f5b26ec8 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Fri, 29 Jan 2010 16:02:06 +0000
Subject: automake: Add 1.11.1 using BBCLASSEXTEND (not default)

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 .../automake/automake/path_prog_fixes.patch        | 67 ++++++++++++++++++++++
 meta/packages/automake/automake_1.11.1.bb          | 50 ++++++++++++++++
 meta/packages/automake/files/path_prog_fixes.patch | 67 ----------------------
 3 files changed, 117 insertions(+), 67 deletions(-)
 create mode 100644 meta/packages/automake/automake/path_prog_fixes.patch
 create mode 100644 meta/packages/automake/automake_1.11.1.bb
 delete mode 100644 meta/packages/automake/files/path_prog_fixes.patch

(limited to 'meta')

diff --git a/meta/packages/automake/automake/path_prog_fixes.patch b/meta/packages/automake/automake/path_prog_fixes.patch
new file mode 100644
index 0000000000..fb38442e30
--- /dev/null
+++ b/meta/packages/automake/automake/path_prog_fixes.patch
@@ -0,0 +1,67 @@
+---
+ Makefile.am |    3 ++-
+ Makefile.in |    3 ++-
+ aclocal.in  |    4 ++--
+ automake.in |    6 ++++--
+ 4 files changed, 10 insertions(+), 6 deletions(-)
+
+Index: automake-1.10.1/Makefile.am
+===================================================================
+--- automake-1.10.1.orig/Makefile.am	2008-01-21 22:28:58.000000000 +0000
++++ automake-1.10.1/Makefile.am	2008-10-10 17:21:20.000000000 +0100
+@@ -75,7 +75,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'
+ 
+ ## These files depend on Makefile so they are rebuilt if $(VERSION),
+ ## $(datadir) or other do_subst'ituted variables change.
+Index: automake-1.10.1/Makefile.in
+===================================================================
+--- automake-1.10.1.orig/Makefile.in	2008-01-21 22:29:10.000000000 +0000
++++ automake-1.10.1/Makefile.in	2008-10-10 17:22:21.000000000 +0100
+@@ -185,7 +185,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
+ WGET_SV_CVS = $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/
+Index: automake-1.10.1/aclocal.in
+===================================================================
+--- automake-1.10.1.orig/aclocal.in	2008-01-21 22:11:41.000000000 +0000
++++ automake-1.10.1/aclocal.in	2008-10-10 17:21:20.000000000 +0100
+@@ -1,8 +1,8 @@
+-#!@PERL@ -w
++#!@bindir@/env perl
+ # -*- perl -*-
+ # @configure_input@
+ 
+-eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
++eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @bindir@/env perl -S "$0" "$@";; esac'
+     if 0;
+ 
+ # aclocal - create aclocal.m4 by scanning configure.ac
+Index: automake-1.10.1/automake.in
+===================================================================
+--- automake-1.10.1.orig/automake.in	2008-01-21 22:11:41.000000000 +0000
++++ automake-1.10.1/automake.in	2008-10-10 17:21:20.000000000 +0100
+@@ -1,8 +1,10 @@
+-#!@PERL@ -w
++#!@bindir@/env perl
+ # -*- perl -*-
+ # @configure_input@
+ 
+-eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
++use warnings;
++
++eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @bindir@/env perl -S "$0" "$@";; esac'
+     if 0;
+ 
+ # automake - create Makefile.in from Makefile.am
diff --git a/meta/packages/automake/automake_1.11.1.bb b/meta/packages/automake/automake_1.11.1.bb
new file mode 100644
index 0000000000..0e75418181
--- /dev/null
+++ b/meta/packages/automake/automake_1.11.1.bb
@@ -0,0 +1,50 @@
+require automake.inc
+
+DEPENDS_virtclass-native = "autoconf-native"
+
+RDEPENDS_automake += "\
+    autoconf \
+    perl \
+    perl-module-bytes \
+    perl-module-constant \
+    perl-module-cwd \
+    perl-module-data-dumper \
+    perl-module-dynaloader \
+    perl-module-errno \
+    perl-module-exporter-heavy \
+    perl-module-file-basename \
+    perl-module-file-compare \
+    perl-module-file-copy \
+    perl-module-file-glob \
+    perl-module-file-spec-unix \
+    perl-module-file-stat \
+    perl-module-getopt-long \
+    perl-module-io \
+    perl-module-io-file \
+    perl-module-posix \
+    perl-module-strict \
+    perl-module-text-parsewords \
+    perl-module-vars "
+
+RDEPENDS_automake-native = "autoconf-native perl-native-runtime"
+
+PATHFIXPATCH = "file://path_prog_fixes.patch;patch=1"
+PATHFIXPATCH_virtclass-native = ""
+
+SRC_URI += "${PATHFIXPATCH}"
+
+NATIVE_INSTALL_WORKS = "1"
+do_install () {
+	oe_runmake 'DESTDIR=${D}' install
+	install -d ${D}${datadir}
+	if [ ! -e ${D}${datadir}/aclocal ]; then
+		ln -sf aclocal-1.10 ${D}${datadir}/aclocal
+	fi
+	if [ ! -e ${D}${datadir}/automake ]; then
+		ln -sf automake-1.10 ${D}${datadir}/automake
+	fi
+}
+
+BBCLASSEXTEND = "native"
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/meta/packages/automake/files/path_prog_fixes.patch b/meta/packages/automake/files/path_prog_fixes.patch
deleted file mode 100644
index fb38442e30..0000000000
--- a/meta/packages/automake/files/path_prog_fixes.patch
+++ /dev/null
@@ -1,67 +0,0 @@
----
- Makefile.am |    3 ++-
- Makefile.in |    3 ++-
- aclocal.in  |    4 ++--
- automake.in |    6 ++++--
- 4 files changed, 10 insertions(+), 6 deletions(-)
-
-Index: automake-1.10.1/Makefile.am
-===================================================================
---- automake-1.10.1.orig/Makefile.am	2008-01-21 22:28:58.000000000 +0000
-+++ automake-1.10.1/Makefile.am	2008-10-10 17:21:20.000000000 +0100
-@@ -75,7 +75,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'
- 
- ## These files depend on Makefile so they are rebuilt if $(VERSION),
- ## $(datadir) or other do_subst'ituted variables change.
-Index: automake-1.10.1/Makefile.in
-===================================================================
---- automake-1.10.1.orig/Makefile.in	2008-01-21 22:29:10.000000000 +0000
-+++ automake-1.10.1/Makefile.in	2008-10-10 17:22:21.000000000 +0100
-@@ -185,7 +185,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
- WGET_SV_CVS = $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/
-Index: automake-1.10.1/aclocal.in
-===================================================================
---- automake-1.10.1.orig/aclocal.in	2008-01-21 22:11:41.000000000 +0000
-+++ automake-1.10.1/aclocal.in	2008-10-10 17:21:20.000000000 +0100
-@@ -1,8 +1,8 @@
--#!@PERL@ -w
-+#!@bindir@/env perl
- # -*- perl -*-
- # @configure_input@
- 
--eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @bindir@/env perl -S "$0" "$@";; esac'
-     if 0;
- 
- # aclocal - create aclocal.m4 by scanning configure.ac
-Index: automake-1.10.1/automake.in
-===================================================================
---- automake-1.10.1.orig/automake.in	2008-01-21 22:11:41.000000000 +0000
-+++ automake-1.10.1/automake.in	2008-10-10 17:21:20.000000000 +0100
-@@ -1,8 +1,10 @@
--#!@PERL@ -w
-+#!@bindir@/env perl
- # -*- perl -*-
- # @configure_input@
- 
--eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-+use warnings;
-+
-+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @bindir@/env perl -S "$0" "$@";; esac'
-     if 0;
- 
- # automake - create Makefile.in from Makefile.am
-- 
cgit v1.2.3