From b1b0006059a6c8e9cf06fc14f2b4cb46736fb822 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Fri, 22 Oct 2010 11:14:57 -0700 Subject: autoconf: don't build the documentation This kills one of the dependencies upon help2man. In the future, will switch this to be driven by a documentation feature in DISTRO_FEATURES. Signed-off-by: Chris Larson --- recipes/autoconf/autoconf.inc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'recipes/autoconf/autoconf.inc') diff --git a/recipes/autoconf/autoconf.inc b/recipes/autoconf/autoconf.inc index fe12daff27..79a81082e9 100644 --- a/recipes/autoconf/autoconf.inc +++ b/recipes/autoconf/autoconf.inc @@ -8,13 +8,16 @@ RDEPENDS_${PN} = "m4 perl gnu-config" DEPENDS_virtclass-native = "m4-native gnu-config-native" RDEPENDS_${PN}_virtclass-native = "m4-native gnu-config-native" -INC_PR = "r9" +INC_PR = "r10" SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2;name=autoconf \ file://program_prefix.patch" inherit autotools +# Excluded: tests man doc +SUBDIRS = "bin . lib" + do_configure_prepend () { if ${@['true', 'false'][bb.data.inherits_class('native', d)]} then @@ -24,5 +27,10 @@ do_configure_prepend () { fi } +do_compile () { + sed -i -e's,^SUBDIRS = .*,SUBDIRS = ${SUBDIRS},' Makefile + oe_runmake +} + PARALLEL_MAKE = "" BBCLASSEXTEND = "native" -- cgit 1.2.3-korg From 173540c96aac632de5ff1a78b25cdc49201ee27e Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 11 Nov 2010 11:03:31 -0700 Subject: autoconf: don't choke on m4-native in ASSUME_PROVIDED Signed-off-by: Chris Larson --- recipes/autoconf/autoconf.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes/autoconf/autoconf.inc') diff --git a/recipes/autoconf/autoconf.inc b/recipes/autoconf/autoconf.inc index 79a81082e9..b82e73c5cf 100644 --- a/recipes/autoconf/autoconf.inc +++ b/recipes/autoconf/autoconf.inc @@ -22,7 +22,7 @@ do_configure_prepend () { if ${@['true', 'false'][bb.data.inherits_class('native', d)]} then export ac_cv_path_PERL="${ac_cv_path_PERL=${bindir}/perl}" - export ac_cv_path_M4="${ac_cv_path_M4=${bindir}/m4}" + export ac_cv_path_M4="${ac_cv_path_M4=m4}" export ac_cv_prog_gnu_m4="${ac_cv_prog_gnu_m4=yes}" fi } -- cgit 1.2.3-korg From dc1e3efb70aeae1979e403defc2ec42c3481931c Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 11 Nov 2010 11:37:47 -0700 Subject: Revert "autoconf: don't choke on m4-native in ASSUME_PROVIDED" Drop this for now, to avoid risk of introduction of another problem. Will revisit and verify both. This reverts commit 173540c96aac632de5ff1a78b25cdc49201ee27e. --- recipes/autoconf/autoconf.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes/autoconf/autoconf.inc') diff --git a/recipes/autoconf/autoconf.inc b/recipes/autoconf/autoconf.inc index b82e73c5cf..79a81082e9 100644 --- a/recipes/autoconf/autoconf.inc +++ b/recipes/autoconf/autoconf.inc @@ -22,7 +22,7 @@ do_configure_prepend () { if ${@['true', 'false'][bb.data.inherits_class('native', d)]} then export ac_cv_path_PERL="${ac_cv_path_PERL=${bindir}/perl}" - export ac_cv_path_M4="${ac_cv_path_M4=m4}" + export ac_cv_path_M4="${ac_cv_path_M4=${bindir}/m4}" export ac_cv_prog_gnu_m4="${ac_cv_prog_gnu_m4=yes}" fi } -- cgit 1.2.3-korg