Re: [PATCH 1/1] Revert "glib-2.0: build dependency cleanup"

Khem Raj
2015-12-31T08:50:25Z

[-- Attachment #1: Type: text/plain, Size: 1938 bytes --]

> On Dec 29, 2015, at 1:43 AM, kai.kang@windriver.com wrote:
>
> From: Kai Kang <kai.kang@windriver.com>
>
> This reverts commit fcd7494b347423185c883b2897c4908929843a71.
>
> It uses command glib-genmarshal to build glib-2.0 which is from
> glibc-2.0-native. If the command doesn't exist on host, build fails

typo 'glib-2.0-native'

> with error:
>
> | /bin/sh: --prefix=test_marshal: command not found
> | make[4]: *** [testmarshal.c] Error 127
>
> So add the dependency back.

I ran into the regression as well. So this patch is good.

>
> Signed-off-by: Kai Kang <kai.kang@windriver.com>
> ---
> meta/recipes-core/glib-2.0/glib.inc | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
> index 86f7e0e..8e4dcd7 100644
> --- a/meta/recipes-core/glib-2.0/glib.inc
> +++ b/meta/recipes-core/glib-2.0/glib.inc
> @@ -17,10 +17,10 @@ SECTION = "libs"
>
> BBCLASSEXTEND = "native nativesdk"
>
> -DEPENDS = "virtual/libiconv libffi zlib"
> -DEPENDS_append = " ${@bb.utils.contains('PTEST_ENABLED', '1', ' glib-2.0-native dbus', '', d)}"
> +DEPENDS = "glib-2.0-native virtual/libiconv libffi zlib"
> +DEPENDS_append_class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', ' dbus', '', d)}"
> DEPENDS_class-native = "pkgconfig-native gettext-native libffi-native zlib-native"
> -DEPENDS_class-nativesdk = "nativesdk-libtool nativesdk-gettext nativesdk-libffi nativesdk-zlib"
> +DEPENDS_class-nativesdk = "nativesdk-libtool nativesdk-gettext nativesdk-libffi nativesdk-zlib ${BPN}-native"
>
> PACKAGES =+ "${PN}-utils ${PN}-bash-completion ${PN}-codegen"
>
> --
> 2.6.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]