--- a/open-src/app/mesa-demos/Makefile	Wed Mar 04 19:15:55 2009 -0800
+++ b/open-src/app/mesa-demos/Makefile	Wed Mar 04 19:18:16 2009 -0800
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.11	09/01/14
+# @(#)Makefile	1.12	09/03/04
 #
 
 # Package name used in tarballs
@@ -83,9 +83,13 @@
 # Only care about building X demos
 DEMOS_DIR=$(SOURCE_DIR)/progs/xdemos
 
+DEMO_LDFLAGS=$(PROG_LDFLAGS) -L$(PROTODIR)$(X11_DIR)/lib$(ARCHLIBSUBDIR)
+
+# Workaround 6724478 libc printf should not SEGV when passed NULL for %s format
+DEMO_LDFLAGS += /usr/lib$(ARCHLIBSUBDIR)/[email protected]
+
 # Flags passed on make command line when building
-MODULE_BUILD_MAKEFLAGS = \
-	LDFLAGS="$(PROG_LDFLAGS) -L$(PROTODIR)$(X11_DIR)/lib$(ARCHLIBSUBDIR)"
+MODULE_BUILD_MAKEFLAGS = LDFLAGS="$(DEMO_LDFLAGS)"
 
 # Use configuration generated by Mesa library build
 $(SOURCE_DIR)/configs/current: $(UNPACK_TARGET)