516029 - flags (XCFLAGS) for including fontconfig/fontconfig.h are not added to compiler command (gfx/cairo)

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[Hanspeter Niederstrasser]

User-Agent:       Mozilla/5.0 (X11; U; Darwin i386; en-US; rv:1.9.3a1pre) Gecko/20090910 Firefox/3.7a1pre
Build Identifier: 

From Bug 505739 Comment#17:

On Darwin9/X11 (OS X 10.5), fontconfig.h lives in /usr/X11/include/fontconfig/fontconfig.h.  Building firefox3 from mozilla-central stopped working after the checkin to bug 505739 that trimmed XCFLAGS out of various FLAGS.  This is the actual error message (a few other .c files gfx/cairo/cairo/src also fail with the same error):

cairo-xlib-screen.c
gcc -o cairo-xlib-screen.o -c -I../../../../dist/system_wrappers -include
/src/mozilla-central/config/gcc_hidden.h -DMOZILLA_INTERNAL_API -D_IMPL_NS_COM
-DEXPORT_XPT_API -DEXPORT_XPTC_API -D_IMPL_NS_GFX -D_IMPL_NS_WIDGET
-DIMPL_XREAPI -DIMPL_NS_NET -DIMPL_THEBES  -DZLIB_INTERNAL
-DOSTYPE=\"Darwin9.8.0\" -DOSARCH=Darwin -DPACKAGE_VERSION="\"moz\""
-DPACKAGE_BUGREPORT="\"http://bugzilla.mozilla.org/\"" -DMOZ_TREE_CAIRO
-I/src/mozilla-central/gfx/cairo/cairo/src
-I/src/mozilla-central/gfx/cairo/cairo/src -I. -I../../../../dist/include
-I../../../../dist/include/nsprpub 
-I/src/mozilla-central/obj-i386-apple-darwin9.8.0-browser/dist/include/nspr
-I/src/mozilla-central/obj-i386-apple-darwin9.8.0-browser/dist/include/nss
-I/sw/include   -I/sw/include/freetype2 -I/sw/include     -fPIC  -Wall -W
-Wno-unused -Wpointer-arith -Wcast-align -W -Wno-long-long -fno-strict-aliasing
-fpascal-strings -fno-common -pthread -pipe  -DNDEBUG -DTRIMMED -O2   -include
../../../../mozilla-config.h -DMOZILLA_CLIENT
-Wp,-MD,.deps/cairo-xlib-screen.pp
/src/mozilla-central/gfx/cairo/cairo/src/cairo-xlib-screen.c
In file included from
/src/mozilla-central/gfx/cairo/cairo/src/cairo-xlib-screen.c:62:
../../../../dist/system_wrappers/fontconfig/fontconfig.h:3:40: error:
fontconfig/fontconfig.h: No such file or directory

My .mozconfig file has --x-libraries=/usr/X11R6/lib and
--x-includes=/usr/X11R6/include and this previously built mozilla-central w/out
any problems.


Reproducible: Always



Expected Results:  
<fontconfig/fontconfig.h> should be found.

I've temporarily set up a workaround here by adding "OS_INCLUDES
+= $(XCFLAGS)" ("TK_CFLAGS += $(XCFLAGS)" didn't work) to the "ifdef MOZ_X11"
block in gfx/cairo/cairo/src/Makefile.in.  Not sure if that's the proper place with how mozilla's Makefiles are organized, but the build does finish successfully after this change.

Comment 1

[Hanspeter Niederstrasser]

Attachment: adds XCFLAGS to OS_INCLUDES [Checkin: Comment 2]

My current patch.

Comment 2

[Serge Gautherie (:sgautherie)]

Comment on attachment 400121 [details] [diff] [review]
adds XCFLAGS to OS_INCLUDES
[Checkin: Comment 2]


http://hg.mozilla.org/mozilla-central/rev/26dc9dc42c2e