[OE-core] [PATCH] pango: add libpng to DEPENDS

[Koen Kooi]

Op 16 apr. 2013, om 11:54 heeft Richard Purdie <richard.purdie at linuxfoundation.org> het volgende geschreven:

> On Tue, 2013-04-16 at 11:10 +0200, Koen Kooi wrote:
>> Pango links indirectly to libpng through the cairo-png dependency, but
>> does encode the libpng version in its .la files. Changing libpng
>> versions will make a rebuild fail, so let's cheat a bit to let sstate
>> rebuild pango as well to get around this.
>> 
>> Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
>> ---
>> meta/recipes-graphics/pango/pango.inc | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> This doesn't follow. If pango -> cairo -> libpng and libpng changes,
> both cairo and pango will rebuild.

If it did get rebuilt it still had references to non-existent libpng16  .la in its .la files.

> What might be the problem is that autotools (or more likely libtool)
> isn't rebuilding correctly. This was solved with the separate build
> directory code. Have you enabled that?

Not that I know off. How do I do that?

regards,

Koen

> 
> Cheers,
> 
> Richard
> 
>> diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
>> index f622903..c1beb9e 100644
>> --- a/meta/recipes-graphics/pango/pango.inc
>> +++ b/meta/recipes-graphics/pango/pango.inc
>> @@ -10,7 +10,7 @@ SECTION = "libs"
>> LICENSE = "LGPLv2.0+"
>> 
>> X11DEPENDS = "virtual/libx11 libxft"
>> -DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo elfutils harfbuzz"
>> +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo elfutils harfbuzz libpng"
>> 
>> PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
>> PACKAGECONFIG[x11] = "--with-x,--without-x,${X11DEPENDS}"
> 
>