From fdbb57d061fab29f3517b43b96e0e16a2bd77902 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Sat, 19 Sep 2009 21:19:28 +0000 Subject: automake: Recipes cleanup and fixes: * Move common part of recipes to automake.inc. * Use conditional ac_cv_path_PERL instead of path_prog_fixes.patch to fix automake on target. * Remove unneeded datadir symlinks that make impossible to install more automake versions. * Make symlinks from unversioned copy of binaries. * Cleanup of obsolete parts of recipesthat make impossible to install more automake versions. * Make symlinks from unversioned copy of binaries. * Cleanup of obsolete parts of recipes. --- .../automake/automake-1.10/path_prog_fixes.patch | 43 ----------------- recipes/automake/automake-native.inc | 4 +- recipes/automake/automake.inc | 25 ++++++++++ recipes/automake/automake_1.10.2.bb | 31 +----------- recipes/automake/automake_1.9.6.bb | 29 +----------- recipes/automake/files/path_prog_fixes.patch | 55 ---------------------- 6 files changed, 29 insertions(+), 158 deletions(-) delete mode 100644 recipes/automake/automake-1.10/path_prog_fixes.patch delete mode 100644 recipes/automake/files/path_prog_fixes.patch (limited to 'recipes/automake') diff --git a/recipes/automake/automake-1.10/path_prog_fixes.patch b/recipes/automake/automake-1.10/path_prog_fixes.patch deleted file mode 100644 index 60d32833ea..0000000000 --- a/recipes/automake/automake-1.10/path_prog_fixes.patch +++ /dev/null @@ -1,43 +0,0 @@ -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 @@ - -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.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~ ---- /tmp/aclocal.in 2009-02-25 15:43:38.000000000 +0100 -+++ automake-1.10/aclocal.in 2009-02-25 15:44:54.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; - - # aclocal - create aclocal.m4 by scanning configure.ac diff --git a/recipes/automake/automake-native.inc b/recipes/automake/automake-native.inc index 5ced30d5df..4e2ac41d81 100644 --- a/recipes/automake/automake-native.inc +++ b/recipes/automake/automake-native.inc @@ -1,7 +1,7 @@ SECTION = "devel" require automake_${PV}.bb -DEPENDS = "autoconf-native" -RDEPENDS_automake-native = "autoconf-native perl-native-runtime" +DEPENDS += "autoconf-native" +RDEPENDS_automake-native += "autoconf-native perl-native-runtime" inherit native diff --git a/recipes/automake/automake.inc b/recipes/automake/automake.inc index a4cdbbb34a..74957cc9e9 100644 --- a/recipes/automake/automake.inc +++ b/recipes/automake/automake.inc @@ -1,3 +1,7 @@ +DESCRIPTION = "A tool for automatically generating Makefiles." +LICENSE = "GPL" +HOMEPAGE = "http://www.gnu.org/software/automake/" +SECTION = "devel" RDEPENDS_automake += "\ autoconf \ perl \ @@ -22,3 +26,24 @@ RDEPENDS_automake += "\ perl-module-strict \ perl-module-text-parsewords \ perl-module-vars " +SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2" +INC_PR = "r2" +AUTOMAKE_API = "${@".".join(bb.data.getVar("PV",d,1).split(".")[0:2])}" + +inherit autotools + +FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*" + +do_configure_prepend () { + if ${@['true', 'false'][bb.data.inherits_class('native', d)]} + then + export ac_cv_path_PERL="${ac_cv_path_PERL=${bindir}/perl}" + fi +} + +do_install_append () { + autotools_do_install + ln -sf aclocal-${AUTOMAKE_API} ${D}${bindir}/aclocal + ln -sf automake-${AUTOMAKE_API} ${D}${bindir}/automake + install -d ${D}${datadir}/aclocal +} diff --git a/recipes/automake/automake_1.10.2.bb b/recipes/automake/automake_1.10.2.bb index 42e0d66d9e..ad6879ada8 100644 --- a/recipes/automake/automake_1.10.2.bb +++ b/recipes/automake/automake_1.10.2.bb @@ -1,31 +1,2 @@ -DESCRIPTION = "A tool for automatically generating Makefiles." -LICENSE = "GPL" -HOMEPAGE = "http://www.gnu.org/software/automake/" -SECTION = "devel" -PR = "r1" - -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.10 ${D}${datadir}/aclocal - fi - if [ ! -e ${D}${datadir}/automake ]; then - ln -sf automake-1.10 ${D}${datadir}/automake - fi -} +PR = "${INC_PR}.0" diff --git a/recipes/automake/automake_1.9.6.bb b/recipes/automake/automake_1.9.6.bb index eef69f4e4a..9b363b9f89 100644 --- a/recipes/automake/automake_1.9.6.bb +++ b/recipes/automake/automake_1.9.6.bb @@ -1,31 +1,4 @@ -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 -} +PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/automake/files/path_prog_fixes.patch b/recipes/automake/files/path_prog_fixes.patch deleted file mode 100644 index 69cea77035..0000000000 --- a/recipes/automake/files/path_prog_fixes.patch +++ /dev/null @@ -1,55 +0,0 @@ -Index: automake-1.10.2/Makefile.am -=================================================================== ---- automake-1.10.2.orig/Makefile.am -+++ automake-1.10.2/Makefile.am -@@ -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.2/Makefile.in -=================================================================== ---- automake-1.10.2.orig/Makefile.in -+++ automake-1.10.2/Makefile.in -@@ -186,7 +186,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.2/automake.in -=================================================================== ---- automake-1.10.2.orig/automake.in -+++ automake-1.10.2/automake.in -@@ -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 -Index: automake-1.10.2/aclocal.in -=================================================================== ---- automake-1.10.2.orig/aclocal.in -+++ automake-1.10.2/aclocal.in -@@ -1,4 +1,4 @@ --#!@PERL@ -w -+#!@bindir@/env perl -w - # -*- perl -*- - # @configure_input@ - -- cgit v1.2.3