From 773c55564853d12aa71388383a5173b759ba1aa1 Mon Sep 17 00:00:00 2001 From: Lianhao Lu Date: Fri, 5 Aug 2011 11:28:36 +0800 Subject: Misc: Corrected the dependency on non-native for -native package. [YOCTO #1336] Corrected the wrong dependency on non-native for -native packages for the following recipes: - util-macros - intltool (From OE-Core rev: e33bd6024c5f4cdd5c16d51e9b5c75ec4e1f1fb8) Signed-off-by: Lianhao Lu Signed-off-by: Richard Purdie --- meta/recipes-core/gettext/gettext_0.18.1.1.bb | 2 +- meta/recipes-devtools/intltool/intltool.inc | 1 + meta/recipes-graphics/xorg-util/util-macros_1.14.0.bb | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb index cc0129f..9ec851e 100644 --- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb +++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb @@ -9,7 +9,7 @@ PR = "r2" DEPENDS = "libxml2-native gettext-native virtual/libiconv ncurses expat" DEPENDS_virtclass-native = "libxml2-native" PROVIDES = "virtual/libintl virtual/gettext" -PROVIDES_virtclass-native = "" +PROVIDES_virtclass-native = "virtual/gettext-native" CONFLICTS_${PN} = "proxy-libintl" SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ " diff --git a/meta/recipes-devtools/intltool/intltool.inc b/meta/recipes-devtools/intltool/intltool.inc index c934654..1e778b6 100644 --- a/meta/recipes-devtools/intltool/intltool.inc +++ b/meta/recipes-devtools/intltool/intltool.inc @@ -9,6 +9,7 @@ S = "${WORKDIR}/intltool-${PV}" DEPENDS = "libxml-parser-perl-native" #RDEPENDS_${PN} = "libxml-parser-perl" RRECOMMENDS_${PN} = "perl-modules" +RRECOMMENDS_${PN}_virtclass-native = "" inherit autotools pkgconfig perlnative diff --git a/meta/recipes-graphics/xorg-util/util-macros_1.14.0.bb b/meta/recipes-graphics/xorg-util/util-macros_1.14.0.bb index 88ee4f6..4fa235b 100644 --- a/meta/recipes-graphics/xorg-util/util-macros_1.14.0.bb +++ b/meta/recipes-graphics/xorg-util/util-macros_1.14.0.bb @@ -12,8 +12,8 @@ PR = "r0" # ${PN} is empty so we need to tweak -dev and -dbg package dependencies DEPENDS = "libgpg-error" -DEPENDS_virtclass-native = "virtual/gettext" -DEPENDS_virtclass-nativesdk = "virtual/gettext" +DEPENDS_virtclass-native = "virtual/gettext-native" +DEPENDS_virtclass-nativesdk = "virtual/gettext-nativesdk" RDEPENDS_${PN}-dev = "" RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" -- cgit v1.1