[oe] [PATCH 4/4] autotools: avoid special casing autoconf/automake/help2man
Khem Raj
raj.khem at gmail.com
Wed Feb 16 22:27:07 UTC 2011
On (16/02/11 15:07), Chris Larson wrote:
> From: Chris Larson <chris_larson at mentor.com>
>
> Signed-off-by: Chris Larson <chris_larson at mentor.com>
we need to document INHIBIT_AUTOTOOLS_BOOTSTRAP
Acked-by: Khem Raj <raj.khem at gmail.com>
> ---
> classes/autotools.bbclass | 6 +-----
> recipes/autoconf/autoconf.inc | 3 ++-
> recipes/automake/automake.inc | 4 +---
> recipes/help2man/help2man_1.36.4.bb | 6 +-----
> recipes/help2man/help2man_1.38.2.bb | 6 +-----
> 5 files changed, 6 insertions(+), 19 deletions(-)
>
> diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
> index dd52e03..eaeca7f 100644
> --- a/classes/autotools.bbclass
> +++ b/classes/autotools.bbclass
> @@ -13,13 +13,9 @@ def autotools_deps(d):
> if oe.data.typed_value('INHIBIT_AUTOTOOLS_BOOTSTRAP', d):
> return deps
>
> - pn = bb.data.getVar('PN', d, 1)
> - if pn in ['autoconf-native', 'automake-native', 'help2man-native']:
> - return deps
> -
> deps += ' autoconf-native automake-native help2man-native'
>
> - if pn not in ['libtool', 'libtool-native', 'libtool-cross']:
> + if d.getVar('BPN', True) != 'libtool':
> deps += ' libtool-native'
> if (not oe.utils.inherits(d, 'native', 'nativesdk', 'cross',
> 'sdk') and
> diff --git a/recipes/autoconf/autoconf.inc b/recipes/autoconf/autoconf.inc
> index 7f22c2b..d13b61e 100644
> --- a/recipes/autoconf/autoconf.inc
> +++ b/recipes/autoconf/autoconf.inc
> @@ -5,8 +5,9 @@ HOMEPAGE = "http://www.gnu.org/software/autoconf/"
> SECTION = "devel"
> DEPENDS += "m4-native perl-native"
> RDEPENDS_${PN} = "m4 perl gnu-config"
> -DEPENDS_virtclass-native = "m4-native gnu-config-native perl-native"
> +DEPENDS_virtclass-native = "m4-native perl-native"
> RDEPENDS_${PN}_virtclass-native = "m4-native gnu-config-native perl-native"
> +INHIBIT_AUTOTOOLS_BOOTSTRAP_virtclass-native = "true"
>
> INC_PR = "r13"
>
> diff --git a/recipes/automake/automake.inc b/recipes/automake/automake.inc
> index de4df34..6ed21cd 100644
> --- a/recipes/automake/automake.inc
> +++ b/recipes/automake/automake.inc
> @@ -28,6 +28,7 @@ RDEPENDS_automake += "\
> perl-module-strict \
> perl-module-text-parsewords \
> perl-module-vars "
> +INHIBIT_AUTOTOOLS_BOOTSTRAP_virtclass-native = "true"
> SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2;name=automake"
> INC_PR = "r4"
> AUTOMAKE_API = "${@".".join(bb.data.getVar("PV",d,1).split(".")[0:2])}"
> @@ -36,9 +37,6 @@ inherit autotools
>
> FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
>
> -do_configure_append() {
> -}
> -
> do_install_append () {
> autotools_do_install
> # replace paths to STAGING_BINDIR_NATIVE/perl with ${bindir}/perl
> diff --git a/recipes/help2man/help2man_1.36.4.bb b/recipes/help2man/help2man_1.36.4.bb
> index 8cb5530..8cd4475 100644
> --- a/recipes/help2man/help2man_1.36.4.bb
> +++ b/recipes/help2man/help2man_1.36.4.bb
> @@ -5,6 +5,7 @@ LICENSE = "GPLv2"
> DEPENDS = "gettext-native perl-native liblocale-gettext-perl-native"
> DEPENDS_virtclass-native = "perl-native autoconf-native automake-native"
> RDEPENDS_${PN} = "gettext perl liblocale-gettext-perl"
> +INHIBIT_AUTOTOOLS_BOOTSTRAP = "true"
>
> TARGET_CC_ARCH += "${LDFLAGS}"
>
> @@ -16,11 +17,6 @@ BBCLASSEXTEND = "native"
>
> PR = "r3"
>
> -# We don't want to reconfigure things
> -do_configure() {
> - oe_runconf
> -}
> -
> do_install_append () {
> # Make sure we use /usr/bin/env perl
> sed -i -e "1s:#!.*:#! /usr/bin/env perl:" ${D}${bindir}/help2man
> diff --git a/recipes/help2man/help2man_1.38.2.bb b/recipes/help2man/help2man_1.38.2.bb
> index ab06186..795bad6 100644
> --- a/recipes/help2man/help2man_1.38.2.bb
> +++ b/recipes/help2man/help2man_1.38.2.bb
> @@ -5,6 +5,7 @@ DEPENDS = "gettext-native perl-native liblocale-gettext-perl-native"
> DEPENDS_virtclass-native = "perl-native autoconf-native automake-native"
> RDEPENDS_${PN} = "gettext perl liblocale-gettext-perl"
> RDEPENDS_${PN}_virtclass-native = ""
> +INHIBIT_AUTOTOOLS_BOOTSTRAP = "true"
> PR = "r2"
>
> SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
> @@ -18,11 +19,6 @@ EXTRA_OECONF = "--disable-nls"
>
> BBCLASSEXTEND = "native"
>
> -# We don't want to reconfigure things
> -do_configure() {
> - oe_runconf
> -}
> -
> do_install_append () {
> # Make sure we use /usr/bin/env perl
> sed -i -e "1s:#!.*:#! /usr/bin/env perl:" ${D}${bindir}/help2man
> --
> 1.7.2.3
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
--
-Khem
More information about the Openembedded-devel
mailing list