From 09b6be8237a3a39dc8def7b348a7008bd23951f1 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Sat, 15 Jan 2011 20:14:53 +0000
Subject: sync configure's -Werror logic with configure.ac

---
 graphite/graphite-updatewerror.patch | 11 +++++++++++
 graphite/makefile.mk                 |  6 +++++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 graphite/graphite-updatewerror.patch

(limited to 'graphite')

diff --git a/graphite/graphite-updatewerror.patch b/graphite/graphite-updatewerror.patch
new file mode 100644
index 000000000000..6d812b6f254a
--- /dev/null
+++ b/graphite/graphite-updatewerror.patch
@@ -0,0 +1,11 @@
+--- misc/silgraphite-2.3.1.orig/engine/configure
++++ misc/build/silgraphite-2.3.1/engine/configure
+@@ -16877,7 +16877,7 @@
+ # (note: the flags here are gcc-specific and may fail with other compilers)
+ build_flags=""
+ if test "$enable_debug" = yes; then
+-  build_flags="$build_flags -O0 -g -Wall -Wno-unknown-pragmas -Wparentheses -Werror"
++  build_flags="$build_flags -O0 -g -Wall -Wno-unknown-pragmas -Wparentheses"
+ elif test "$enable_strict" = yes; then
+   build_flags="$build_flags -DNDEBUG -Wall -Wno-unknown-pragmas -Wparentheses -Werror"
+ else
diff --git a/graphite/makefile.mk b/graphite/makefile.mk
index 1134a29a4403..181d70b27728 100644
--- a/graphite/makefile.mk
+++ b/graphite/makefile.mk
@@ -47,9 +47,13 @@ all:
 .IF "$(ENABLE_GRAPHITE)"=="TRUE"
 TARFILE_NAME=silgraphite-2.3.1
 TARFILE_MD5=d35724900f6a4105550293686688bbb3
+#graphite-updatewerror.patch -Werror passed to CFLAGS configure for
+#--enable-debug, but not in configure.ac, so update configure to
+#match
 PATCH_FILES=\
     graphite-2.3.1.patch \
-    graphite-removeobsolete.patch
+    graphite-removeobsolete.patch \
+    graphite-updatewerror.patch
 
 # convert line-endings to avoid problems when patching
 CONVERTFILES=\
-- 
cgit