Patchwork [meta-browser] firefox: workaround for freetype-config breakage

login
register
mail settings
Submitter Koen Kooi
Date July 8, 2014, 12:32 p.m.
Message ID <1404822759-25699-1-git-send-email-koen.kooi@linaro.org>
Download mbox | patch
Permalink /patch/75173/
State Accepted, archived
Headers show

Comments

Koen Kooi - July 8, 2014, 12:32 p.m.
All binconfig scripts in OE-core have been disabled, leading to -I/usr/include/freetype2 disappearing from C(PP)FLAGS. Add it in manually as a workaround, mozilla autotools are a maze and not easily fixed.

Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
---
 recipes-mozilla/firefox/firefox_10.0.11esr.bb | 1 +
 1 file changed, 1 insertion(+)
Martin Jansa - Aug. 6, 2014, 10:24 a.m.
On Tue, Jul 08, 2014 at 02:32:39PM +0200, Koen Kooi wrote:
> All binconfig scripts in OE-core have been disabled, leading to -I/usr/include/freetype2 disappearing from C(PP)FLAGS. Add it in manually as a workaround, mozilla autotools are a maze and not easily fixed.

I've merged this one.

Thanks

> Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
> ---
>  recipes-mozilla/firefox/firefox_10.0.11esr.bb | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/recipes-mozilla/firefox/firefox_10.0.11esr.bb b/recipes-mozilla/firefox/firefox_10.0.11esr.bb
> index 1a1178c..98da1a4 100644
> --- a/recipes-mozilla/firefox/firefox_10.0.11esr.bb
> +++ b/recipes-mozilla/firefox/firefox_10.0.11esr.bb
> @@ -85,6 +85,7 @@ inherit mozilla
>  EXTRA_OEMAKE = "installdir=${libdir}/${PN}"
>  
>  ARM_INSTRUCTION_SET = "arm"
> +TARGET_CC_ARCH += " -I${STAGING_INCDIR}/freetype2"
>  
>  do_install() {
>  	oe_runmake DESTDIR="${D}" destdir="${D}" install
> -- 
> 1.9.3
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

diff --git a/recipes-mozilla/firefox/firefox_10.0.11esr.bb b/recipes-mozilla/firefox/firefox_10.0.11esr.bb
index 1a1178c..98da1a4 100644
--- a/recipes-mozilla/firefox/firefox_10.0.11esr.bb
+++ b/recipes-mozilla/firefox/firefox_10.0.11esr.bb
@@ -85,6 +85,7 @@  inherit mozilla
 EXTRA_OEMAKE = "installdir=${libdir}/${PN}"
 
 ARM_INSTRUCTION_SET = "arm"
+TARGET_CC_ARCH += " -I${STAGING_INCDIR}/freetype2"
 
 do_install() {
 	oe_runmake DESTDIR="${D}" destdir="${D}" install