[OE-core] [PATCH 08/19] libpng 1.6.13: fix build for aarch64

[Richard Purdie]

On Mon, 2014-12-22 at 09:41 +0000, Richard Purdie wrote:
> On Thu, 2014-12-18 at 16:51 +0800, Kai Kang wrote:
> > From: Koen Kooi <koen.kooi at linaro.org>
> > 
> > The configure override was too restrictive, it needed both 'arm' and
> > 'neon' to trigger, which breaks on aarch64. Since TUNE_FEATURES is the
> > only qualifier that matters, drop the 'arm' override.
> > 
> > Buildtested for 'genericarmv8' and 'qemux86' machines.
> > 
> > Signed-off-by: Koen Kooi <koen.kooi at linaro.org>
> > ---
> >  meta/recipes-multimedia/libpng/libpng_1.6.13.bb | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.13.bb b/meta/recipes-multimedia/libpng/libpng_1.6.13.bb
> > index 0c6fd1f..8798a96 100644
> > --- a/meta/recipes-multimedia/libpng/libpng_1.6.13.bb
> > +++ b/meta/recipes-multimedia/libpng/libpng_1.6.13.bb
> > @@ -19,7 +19,7 @@ BINCONFIG = "${bindir}/libpng-config ${bindir}/libpng16-config"
> >  inherit autotools binconfig-disabled pkgconfig
> >  
> >  # Work around missing symbols
> > -EXTRA_OECONF_append_arm = " ${@bb.utils.contains("TUNE_FEATURES", "neon", "--enable-arm-neon=on", "--enable-arm-neon=off" ,d)}"
> > +EXTRA_OECONF_append = " ${@bb.utils.contains("TUNE_FEATURES", "neon", "--enable-arm-neon=on", "--enable-arm-neon=off" ,d)}"
> >  
> >  PACKAGES =+ "${PN}-tools"
> >  
> 
> I tried a test build of this series and see:
> 
> https://autobuilder.yoctoproject.org/main/builders/nightly-arm/builds/136/steps/BuildImages_1/logs/stdio
> 
> in the output. Could someone look into that please? I'm guessing its
> related to this patch although I haven't bisected exactly.

In the interests of expediency, I'm testing:

diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.13.bb b/meta/recipes-multimedia/libpng/libpng_1.6.13.bb
index 8798a96..2c6260a 100644
--- a/meta/recipes-multimedia/libpng/libpng_1.6.13.bb
+++ b/meta/recipes-multimedia/libpng/libpng_1.6.13.bb
@@ -19,7 +19,7 @@ BINCONFIG = "${bindir}/libpng-config ${bindir}/libpng16-config"
 inherit autotools binconfig-disabled pkgconfig
 
 # Work around missing symbols
-EXTRA_OECONF_append = " ${@bb.utils.contains("TUNE_FEATURES", "neon", "--enable-arm-neon=on", "--enable-arm-neon=off" ,d)}"
+EXTRA_OECONF_append_class-target = " ${@bb.utils.contains("TUNE_FEATURES", "neon", "--enable-arm-neon=on", "--enable-arm-neon=off" ,d)}"
 
 PACKAGES =+ "${PN}-tools"
 

since the change breaks libpng-native, but only when there is an arm
target. I've also put a couple of fixes in for other arm64 issues in
runqemu and in poky.conf, then I've submitted this to the autobuilder
for another round of testing.

Cheers,

Richard