1047548 - Qt/No-X builds are failing because of missing Cairo build flags

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[Gian-Carlo Pascutto [:gcp]]

Doing a no-X build is failing for me in cairo-qt-surface.cpp.

After some investigation, the Cairo moz.build file is setting the build flags by modifying CFLAGS, but some of the sources are C++, so CXXFLAGS needs to be modified as well.

Comment 1

[Gian-Carlo Pascutto [:gcp]]

Attachment: Patch 1. fix-cpluplus-buildflags

Comment 2

[Mike Hommey [:glandium]]

Comment on attachment 8466351 [details] [diff] [review]
Patch 1. fix-cpluplus-buildflags

Review of attachment 8466351 [details] [diff] [review]:
-----------------------------------------------------------------

::: gfx/cairo/cairo/src/moz.build
@@ +226,5 @@
>      CFLAGS += CONFIG['XCFLAGS']
>  
>  if CONFIG['MOZ_ENABLE_CAIRO_FT']:
> +    CFLAGS   += CONFIG['CAIRO_FT_CFLAGS']
> +    CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']

We usually don't align +=.

Comment 3

[Gian-Carlo Pascutto [:gcp]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/911cc1b35f4b

Comment 4

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/911cc1b35f4b