From: Gary Thomas Date: Tue, 21 Oct 2014 12:12:20 +0000 (-0600) Subject: cairo: Fix PACKAGECONFIG settings X-Git-Tag: 2.1~831 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=a658b675bfa500524a1680ce111d7b037e02cb8b;p=meta-freescale.git cairo: Fix PACKAGECONFIG settings Remove a forced setting of PACKAGECONFIG_mx6 - this caused some flags which were set by the main recipe to be lost, e.g. "x11". The flags which are being set by these lines are correctly set in the main recipe, so this change fixes the errant behaviour with no other side effects. Signed-off-by: Gary Thomas Signed-off-by: Otavio Salvador --- diff --git a/meta-fsl-arm/recipes-graphics/cairo/cairo_%.bbappend b/meta-fsl-arm/recipes-graphics/cairo/cairo_%.bbappend index 9eb32537..2b72535e 100644 --- a/meta-fsl-arm/recipes-graphics/cairo/cairo_%.bbappend +++ b/meta-fsl-arm/recipes-graphics/cairo/cairo_%.bbappend @@ -6,8 +6,5 @@ CFLAGS_append_mx6 = " -DLINUX \ '-DEGL_API_DFB', '-DEGL_API_FB', d),d),d)}" -PACKAGECONFIG_mx6 = " \ - ${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" - PACKAGECONFIG_append_mx6q = " egl glesv2" PACKAGECONFIG_append_mx6dl = " egl glesv2"