summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-11-26 14:23:34 +0000
committerMike Frysinger <vapier@gentoo.org>2006-11-26 14:23:34 +0000
commit04d6846c7a36f0fb3bf3ef6e955a61db13867578 (patch)
tree112aef064a1f35ee74994f2d08522d8a947ffcc3 /dev-libs/redland/files
parentNew upstream version. (diff)
downloadgentoo-2-04d6846c7a36f0fb3bf3ef6e955a61db13867578.tar.gz
gentoo-2-04d6846c7a36f0fb3bf3ef6e955a61db13867578.tar.bz2
gentoo-2-04d6846c7a36f0fb3bf3ef6e955a61db13867578.zip
Backport fix from upstream for people using -Os when building mysql #151935.
(Portage version: 2.1.2_rc2-r2)
Diffstat (limited to 'dev-libs/redland/files')
-rw-r--r--dev-libs/redland/files/redland-1.0.4-CFLAGS.patch34
1 files changed, 34 insertions, 0 deletions
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
+
+