Bug 551277: followup bustage fix for ycbcr+layers build-order, in non-libxul builds. pending r?roc -- landing now to fix thunderbird bustage. a=dholbert
authorChris Double <chris.double@double.co.nz>
Fri, 23 Apr 2010 15:13:52 -0700
changeset 41225 e825fb134e7a4985478780de6356b0b24a698dc5
parent 41224 85b315d1f708855a044fcb7e8b2fcc89f9e54c5c
child 41226 983c5a5c13852ccb0bbccd2f4081b319d2300db3
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc, dholbert
bugs551277
milestone1.9.3a5pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
Bug 551277: followup bustage fix for ycbcr+layers build-order, in non-libxul builds. pending r?roc -- landing now to fix thunderbird bustage. a=dholbert
gfx/Makefile.in
--- a/gfx/Makefile.in
+++ b/gfx/Makefile.in
@@ -43,17 +43,27 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= gfx
 
 ifdef MOZ_TREE_CAIRO
 DIRS		= cairo
 endif
 
-DIRS		+= thebes public idl src qcms layers ycbcr
+DIRS		+= thebes public idl src qcms
+
+# In static builds, ycbcr must appear after layers in
+# the link line on linux. This order is defined by the
+# order listed in DIRS. On shared builds ycbcr must
+# be built first so the order is reversed.
+ifdef BUILD_STATIC_LIBS
+DIRS		+= layers ycbcr
+else
+DIRS            += ycbcr layers
+endif
 
 ifdef MOZ_IPC
 DIRS		+= ipc
 endif
 
 ifdef ENABLE_TESTS
 ifndef MOZ_ENABLE_LIBXUL
 TOOL_DIRS	+= tests