From bf6786ba6329c3bd920280006720ebc3db115ec6 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Thu, 5 Jul 2012 05:18:53 -0700 Subject: automake: upgrade from 1.11.3 to 1.12.1 (From OE-Core rev: c6b70eff7614ea774c0d8e39520f76bdce0ed977) Signed-off-by: Nitin A Kamble Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../automake/automake/path_prog_fixes.patch | 40 ++----------- meta/recipes-devtools/automake/automake_1.11.3.bb | 67 ---------------------- meta/recipes-devtools/automake/automake_1.12.1.bb | 66 +++++++++++++++++++++ 3 files changed, 72 insertions(+), 101 deletions(-) delete mode 100644 meta/recipes-devtools/automake/automake_1.11.3.bb create mode 100644 meta/recipes-devtools/automake/automake_1.12.1.bb (limited to 'meta/recipes-devtools/automake') diff --git a/meta/recipes-devtools/automake/automake/path_prog_fixes.patch b/meta/recipes-devtools/automake/automake/path_prog_fixes.patch index 312cec6..9ee0672 100644 --- a/meta/recipes-devtools/automake/automake/path_prog_fixes.patch +++ b/meta/recipes-devtools/automake/automake/path_prog_fixes.patch @@ -7,38 +7,10 @@ Upstream-Status: Inappropriate [embedded specific] automake.in | 6 ++++-- 4 files changed, 10 insertions(+), 6 deletions(-) -Index: automake-1.10.1/Makefile.am +Index: automake-1.12.1/aclocal.in =================================================================== ---- 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 +--- automake-1.12.1.orig/aclocal.in ++++ automake-1.12.1/aclocal.in @@ -1,8 +1,8 @@ -#!@PERL@ -w +#!@bindir@/env perl @@ -50,10 +22,10 @@ Index: automake-1.10.1/aclocal.in if 0; # aclocal - create aclocal.m4 by scanning configure.ac -Index: automake-1.10.1/automake.in +Index: automake-1.12.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 +--- automake-1.12.1.orig/automake.in ++++ automake-1.12.1/automake.in @@ -1,8 +1,10 @@ -#!@PERL@ -w +#!@bindir@/env perl diff --git a/meta/recipes-devtools/automake/automake_1.11.3.bb b/meta/recipes-devtools/automake/automake_1.11.3.bb deleted file mode 100644 index 2008774..0000000 --- a/meta/recipes-devtools/automake/automake_1.11.3.bb +++ /dev/null @@ -1,67 +0,0 @@ -require automake.inc -LICENSE="GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS_virtclass-native = "autoconf-native" - -RDEPENDS_${PN} += "\ - 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_${PN}_virtclass-native = "autoconf-native perl-native-runtime" -RDEPENDS_${PN}_virtclass-nativesdk = "autoconf-nativesdk" - -PATHFIXPATCH = "file://path_prog_fixes.patch" -PATHFIXPATCH_virtclass-native = "" -PATHFIXPATCH_virtclass-nativesdk = "" - -PERLPATH = "${bindir}/perl" -PERLPATH_virtclass-native = "/usr/bin/perl" -PERLPATH_virtclass-nativesdk = "/usr/bin/perl" - -SRC_URI += "${PATHFIXPATCH} \ - file://prefer-cpio-over-pax-for-ustar-archives.patch \ - file://python-libdir.patch \ - file://py-compile-compile-only-optimized-byte-code.patch" - - -SRC_URI[md5sum] = "93ecb319f0365cb801990b00f658d026" -SRC_URI[sha256sum] = "921b5188057e57bdd9c0ba06e21d0b0ea7dafa61a9bd08a2b041215bcff12f55" - -PR = "r0" - -do_install () { - oe_runmake 'DESTDIR=${D}' install - install -d ${D}${datadir} - - # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location - # for target as /usr/bin/perl, so fix it to /usr/bin/perl. - for i in aclocal aclocal-1.11 automake automake-1.11; do - if [ -f ${D}${bindir}/$i ]; then - sed -i -e '1s,#!.*perl,#! ${PERLPATH},' \ - -e 's,exec .*/bin/perl \(.*\) exec .*/bin/perl \(.*\),exec ${PERLPATH} \1 exec ${PERLPATH} \2,' \ - ${D}${bindir}/$i - fi - done -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/automake/automake_1.12.1.bb b/meta/recipes-devtools/automake/automake_1.12.1.bb new file mode 100644 index 0000000..c2bc6a3 --- /dev/null +++ b/meta/recipes-devtools/automake/automake_1.12.1.bb @@ -0,0 +1,66 @@ +require automake.inc +LICENSE="GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +DEPENDS_virtclass-native = "autoconf-native" + +RDEPENDS_${PN} += "\ + 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_${PN}_virtclass-native = "autoconf-native perl-native-runtime" +RDEPENDS_${PN}_virtclass-nativesdk = "autoconf-nativesdk" + +PATHFIXPATCH = "file://path_prog_fixes.patch" +PATHFIXPATCH_virtclass-native = "" +PATHFIXPATCH_virtclass-nativesdk = "" + +PERLPATH = "${bindir}/perl" +PERLPATH_virtclass-native = "/usr/bin/perl" +PERLPATH_virtclass-nativesdk = "/usr/bin/perl" + +SRC_URI += "${PATHFIXPATCH} \ + file://prefer-cpio-over-pax-for-ustar-archives.patch \ + file://python-libdir.patch \ + file://py-compile-compile-only-optimized-byte-code.patch" + +SRC_URI[md5sum] = "ec25c1855cacf47e4bdee76a776b96ba" +SRC_URI[sha256sum] = "24bf1640679ba4a9cbe2d36422f39a81eced7f556b576a7a2ccfc70ca85a1e2f" + +PR = "r0" + +do_install () { + oe_runmake 'DESTDIR=${D}' install + install -d ${D}${datadir} + + # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location + # for target as /usr/bin/perl, so fix it to /usr/bin/perl. + for i in aclocal aclocal-1.11 automake automake-1.11; do + if [ -f ${D}${bindir}/$i ]; then + sed -i -e '1s,#!.*perl,#! ${PERLPATH},' \ + -e 's,exec .*/bin/perl \(.*\) exec .*/bin/perl \(.*\),exec ${PERLPATH} \1 exec ${PERLPATH} \2,' \ + ${D}${bindir}/$i + fi + done +} + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.1