Backport fix from upstream for people using -Os when building mysql #151935.

(Portage version: 2.1.2_rc2-r2)

3 files changed, 41 insertions, 2 deletions

diff --git a/dev-libs/redland/ChangeLog b/dev-libs/redland/ChangeLog
index 5dfbee086a42..ea3a619e64c4 100644
--- a/dev-libs/redland/ChangeLog
+++ b/dev-libs/redland/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/redland
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/ChangeLog,v 1.16 2006/11/25 13:21:53 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/ChangeLog,v 1.17 2006/11/26 14:23:34 vapier Exp $
+
+  26 Nov 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/redland-1.0.4-CFLAGS.patch, redland-1.0.4.ebuild:
+  Backport fix from upstream for people using -Os when building mysql #151935.
 
   25 Nov 2006; <blubb@gentoo.org> redland-1.0.4.ebuild:
   going back to ~amd64 until the issue in bug 151935 comment 6 is fixed
diff --git a/dev-libs/redland/files/redland-1.0.4-CFLAGS.patch b/dev-libs/redland/files/redland-1.0.4-CFLAGS.patch
new file mode 100644
index 000000000000..e0d0a0e73e57
--- /dev/null
+++ b/dev-libs/redland/files/redland-1.0.4-CFLAGS.patch
@@ -0,0 +1,34 @@
+backport fix from upstream
+
+http://bugs.gentoo.org/151935#c6
+
+--- configure
++++ configure
+@@ -23872,7 +23872,7 @@
+   mysql_libs=`$MYSQL_CONFIG --libs|sed -e "s/'//g"`
+   LIBRDF_LIBS="$LIBRDF_LIBS $mysql_libs"
+       # Stop the MySQL config program adding -O<n> options to CFLAGS
+-  mysql_cflags=`$MYSQL_CONFIG --cflags | sed -e "s/'//g" -e "s/-O[1-9]*//" `
++  mysql_cflags=`$MYSQL_CONFIG --cflags | sed -e "s/'//g" -e "s/-O[A-Za-z0-9]*//" `
+   LIBRDF_CPPFLAGS="$LIBRDF_CPPFLAGS $mysql_cflags"
+   fi
+ if test $sqlite_storage  = yes; then
+@@ -24259,12 +24259,12 @@
+ fi
+ 
+ if test "$USE_MAINTAINER_MODE" = yes -a $release_version = no; then
+-      CFLAGS=`echo $CFLAGS | sed s/-O[1-9]*//`
+-  CXXFLAGS=`echo $CXXFLAGS | sed s/-O[1-9]*//`
+-  STANDARD_CFLAGS=`echo $STANDARD_CFLAGS | sed s/-O[1-9]*//`
+-  LIBRDF_CPPFLAGS=`echo $LIBRDF_CPPFLAGS | sed s/-O[1-9]*//`
+-  LIBRDF_EXTERNAL_CPPFLAGS=`echo $LIBRDF_EXTERNAL_CPPFLAGS | sed s/-O[1-9]*//`
+-  LIBRDF_INTERNAL_CPPFLAGS=`echo $LIBRDF_INTERNAL_CPPFLAGS | sed s/-O[1-9]*//`
++      CFLAGS=`echo $CFLAGS | sed s/-O[A-Za-z0-9]*//`
++  CXXFLAGS=`echo $CXXFLAGS | sed s/-O[A-Za-z0-9]*//`
++  STANDARD_CFLAGS=`echo $STANDARD_CFLAGS | sed s/-O[A-Za-z0-9]*//`
++  LIBRDF_CPPFLAGS=`echo $LIBRDF_CPPFLAGS | sed s/-O[A-Za-z0-9]*//`
++  LIBRDF_EXTERNAL_CPPFLAGS=`echo $LIBRDF_EXTERNAL_CPPFLAGS | sed s/-O[A-Za-z0-9]*//`
++  LIBRDF_INTERNAL_CPPFLAGS=`echo $LIBRDF_INTERNAL_CPPFLAGS | sed s/-O[A-Za-z0-9]*//`
+   fi
+ 
+ 
diff --git a/dev-libs/redland/redland-1.0.4.ebuild b/dev-libs/redland/redland-1.0.4.ebuild
index bd26e9112ea8..bc77d498de78 100644
--- a/dev-libs/redland/redland-1.0.4.ebuild
+++ b/dev-libs/redland/redland-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/redland-1.0.4.ebuild,v 1.7 2006/11/25 13:21:53 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/redland-1.0.4.ebuild,v 1.8 2006/11/26 14:23:34 vapier Exp $
 
 inherit eutils
 
@@ -25,6 +25,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-1.0.3-configure.patch
+	epatch "${FILESDIR}"/${PN}-1.0.4-CFLAGS.patch
 	rm -r "${S}"/{raptor,rasqal}
 }