From 5b8ca9882625b354c5d935a14067568414fc369e Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 23 Jul 2011 20:08:18 +0200
Subject: remove -flto

---
 package/cairo/Makefile                |  4 +++-
 package/cairo/patches/patch-configure | 11 +++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 package/cairo/patches/patch-configure

(limited to 'package/cairo')

diff --git a/package/cairo/Makefile b/package/cairo/Makefile
index 544586301..de4bad1ce 100644
--- a/package/cairo/Makefile
+++ b/package/cairo/Makefile
@@ -27,10 +27,12 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,CAIRO_DEV,cairo-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_CAIRO_DEV},${PKGSC_CAIRO_DEV},${PKG_OPTS}))
 
-TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 ifeq (,$(filter arm,$(TARGET_ARCH)))
 TARGET_CFLAGS:=         $(filter-out -Os,$(TARGET_CFLAGS))
 endif
+ifeq (,$(filter cris,$(TARGET_ARCH)))
+TARGET_CFLAGS:=         $(filter-out -Os,$(TARGET_CFLAGS))
+endif
 CONFIGURE_ARGS+=	--enable-ft=yes \
 			--enable-tee=yes \
 			--enable-xlib=yes
diff --git a/package/cairo/patches/patch-configure b/package/cairo/patches/patch-configure
new file mode 100644
index 000000000..91e1f8cd4
--- /dev/null
+++ b/package/cairo/patches/patch-configure
@@ -0,0 +1,11 @@
+--- cairo-1.10.2.orig/configure	2010-12-25 15:22:57.000000000 +0100
++++ cairo-1.10.2/configure	2011-07-23 14:58:11.293924415 +0200
+@@ -17236,7 +17236,7 @@ MAYBE_WARN="-Wall -Wextra \
+ MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_TYPE_MISMATCH_ARG \
+ 			-erroff=E_ENUM_TYPE_MISMATCH_OP"
+ 
+-MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common -flto"
++MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
+ 
+ MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2"
+ 
-- 
cgit v1.2.3