From 0fa52f70789afe5a53384ba20249af34c16a8568 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 17 Dec 2011 10:08:53 +0000 Subject: native.bbclass: Fix variable remapping coverage When looking for RDEPENDS to process, bitbake iterates through PACKAGES *and* PN. Since native.bbclass sets PACKAGES to be empty, its pointless remapping the list of PACKAGES since this does nothing. There is a problem since *_${PN} are used by bitbake but not remapped by the native.bbclass class extension code. This changes the code to remap _${PN} in both expanded and unexpanded forms. As a result of this, various surprising dependencies are uncovered and the patch rectifies those. These are real bugs since they're injecting unneeded (unremapped) dependencies into the dependency chain. (From OE-Core rev: 0f485bfd6fc82a109b9da629e464fca1e90faec3) Signed-off-by: Richard Purdie --- meta/recipes-devtools/autoconf/autoconf.inc | 2 ++ meta/recipes-devtools/autoconf/autoconf_2.68.bb | 8 -------- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'meta/recipes-devtools/autoconf') diff --git a/meta/recipes-devtools/autoconf/autoconf.inc b/meta/recipes-devtools/autoconf/autoconf.inc index 08a1b02..1d0cf90 100644 --- a/meta/recipes-devtools/autoconf/autoconf.inc +++ b/meta/recipes-devtools/autoconf/autoconf.inc @@ -6,6 +6,8 @@ LICENSE = "GPLv3" HOMEPAGE = "http://www.gnu.org/software/autoconf/" SECTION = "devel" DEPENDS += "m4-native" +DEPENDS_virtclass-native = "m4-native gnu-config-native" +DEPENDS_virtclass-nativesdk = "m4-nativesdk gnu-config-nativesdk" RDEPENDS_${PN} = "m4 gnu-config" SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \ diff --git a/meta/recipes-devtools/autoconf/autoconf_2.68.bb b/meta/recipes-devtools/autoconf/autoconf_2.68.bb index 9028e83..84eb182 100644 --- a/meta/recipes-devtools/autoconf/autoconf_2.68.bb +++ b/meta/recipes-devtools/autoconf/autoconf_2.68.bb @@ -4,8 +4,6 @@ PR = "r4" PARALLEL_MAKE = "" -DEPENDS += "m4-native" -RDEPENDS_${PN} = "m4 gnu-config" LICENSE = "GPLv2 & GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504" @@ -22,12 +20,6 @@ SRC_URI += "file://autoreconf-include.patch \ SRC_URI[md5sum] = "864d785215aa60d627c91fcb21b05b07" SRC_URI[sha256sum] = "c491fb273fd6d4ca925e26ceed3d177920233c76d542b150ff35e571454332c8" -DEPENDS_virtclass-native = "m4-native gnu-config-native" -RDEPENDS_${PN}_virtclass-native = "m4-native gnu-config-native" - -DEPENDS_virtclass-nativesdk = "m4-nativesdk gnu-config-nativesdk" -RDEPENDS_${PN}_virtclass-nativesdk = "m4-nativesdk gnu-config-nativesdk" - SRC_URI_append_virtclass-native = " file://fix_path_xtra.patch" EXTRA_OECONF += "ac_cv_path_M4=m4" -- cgit v1.1