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

Package-Manager: portage-2.1.2_rc2-r2

4 files changed, 63 insertions, 10 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/Manifest b/dev-libs/redland/Manifest
index 3c2a3cda4c11..89748e9064fa 100644
--- a/dev-libs/redland/Manifest
+++ b/dev-libs/redland/Manifest
@@ -1,7 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX redland-1.0.3-configure.patch 267 RMD160 01154240bce4e0903aec55e9365dc7d099eaf1d1 SHA1 0cb81d7917b8e06daeef2116b302f37a82a24e1f SHA256 22a31320f6cacfaad2a942a2454e223b7bd3d6509063b3681d3a7941389b16ba
 MD5 4c7cef6bddbff704dd486790b7421f38 files/redland-1.0.3-configure.patch 267
 RMD160 01154240bce4e0903aec55e9365dc7d099eaf1d1 files/redland-1.0.3-configure.patch 267
 SHA256 22a31320f6cacfaad2a942a2454e223b7bd3d6509063b3681d3a7941389b16ba files/redland-1.0.3-configure.patch 267
+AUX redland-1.0.4-CFLAGS.patch 1444 RMD160 ec8fe4f5bbc24933b974256df465df052b80e8ef SHA1 18a784ec5a69d4e926f2df9a822138a5a5e08251 SHA256 e5c302a0a790da6b243239ee81412caba73a3aaca371d783e5e4f7dcca716f53
+MD5 3d04595f30267f04e23987d8fdeaf3b5 files/redland-1.0.4-CFLAGS.patch 1444
+RMD160 ec8fe4f5bbc24933b974256df465df052b80e8ef files/redland-1.0.4-CFLAGS.patch 1444
+SHA256 e5c302a0a790da6b243239ee81412caba73a3aaca371d783e5e4f7dcca716f53 files/redland-1.0.4-CFLAGS.patch 1444
 DIST redland-1.0.0.tar.gz 2578757 RMD160 ca256c07f9c91b3f1535abbb4ea516bc2c8bbad2 SHA1 fa75b65fd9590965eea7e11c16bdb02e834853b4 SHA256 1ada0261ed1bd4979ebbffb0bb739dd6ae5bd657bcc1d8bcf10cf16312109da7
 DIST redland-1.0.2.tar.gz 2806461 RMD160 d58bff31428579df8c86e64953fc87d127220d1d SHA1 15ebe8810b0e80d5c49c02e331239ec29b3af088 SHA256 790f9074c02378b70f78a4ee307d68a0e755ce152e5b4444bb8f7cb5686ff69d
 DIST redland-1.0.3.tar.gz 3189904 RMD160 16852a27076b45add4a3bc55d3c72e90ace174eb SHA1 cb15995b8aa3139beff0dc9c023f2cfa6d73d9e1 SHA256 eb5d8848bc399a7d5eb5e1f7ab989c862a412f4a4ce37f04f7b72f883aec9e31
@@ -18,14 +25,14 @@ EBUILD redland-1.0.3.ebuild 1152 RMD160 f4986a8f28eecb13388e1001013dac427d5f50c3
 MD5 424d07905488cb3b0a7fa5fbc875f69f redland-1.0.3.ebuild 1152
 RMD160 f4986a8f28eecb13388e1001013dac427d5f50c3 redland-1.0.3.ebuild 1152
 SHA256 015d8ddc3decc1e05578085eea67dd1785833d479967a67facf50105e0c9115a redland-1.0.3.ebuild 1152
-EBUILD redland-1.0.4.ebuild 1164 RMD160 589d9f6bb14ba89c3db5c3ec681ab3feefd14378 SHA1 4b4fa2c5603772dbd3a7e3f5d867c613c5da6177 SHA256 40353c517bd554150fa1f95c098e9d45a35dc1c6a9545570a3f50bd90528d07d
-MD5 cd95a35aa5e1c8c5f0e20279e94edef3 redland-1.0.4.ebuild 1164
-RMD160 589d9f6bb14ba89c3db5c3ec681ab3feefd14378 redland-1.0.4.ebuild 1164
-SHA256 40353c517bd554150fa1f95c098e9d45a35dc1c6a9545570a3f50bd90528d07d redland-1.0.4.ebuild 1164
-MISC ChangeLog 2104 RMD160 492dcbb53072da85f60a5c70e8ecb5c84a6ecc92 SHA1 e4b274b32d2249efa8dfd5ee55e978389eb13cd0 SHA256 498d3e716e589b6125d5043a0666781401432c694c96861c215ff04bca0652db
-MD5 2c95d92ba4ac53e15692090807015168 ChangeLog 2104
-RMD160 492dcbb53072da85f60a5c70e8ecb5c84a6ecc92 ChangeLog 2104
-SHA256 498d3e716e589b6125d5043a0666781401432c694c96861c215ff04bca0652db ChangeLog 2104
+EBUILD redland-1.0.4.ebuild 1212 RMD160 d9d2f69df14fa30c56691230a3debed23e115627 SHA1 8f6d4ad7e6574a1f3499d8715c66a338fe4916cb SHA256 04acf97f1bbe22229c7c5b010b137147f0f498f9749da5b95366e62e77eeed8f
+MD5 94a96e2e7aa84250d317547f0304d0c1 redland-1.0.4.ebuild 1212
+RMD160 d9d2f69df14fa30c56691230a3debed23e115627 redland-1.0.4.ebuild 1212
+SHA256 04acf97f1bbe22229c7c5b010b137147f0f498f9749da5b95366e62e77eeed8f redland-1.0.4.ebuild 1212
+MISC ChangeLog 2294 RMD160 d914a3bc6c388b6ee3ce769e6e6110aceb30c096 SHA1 314da9f5dfc1a3bf584d1d765409c44d883c77fb SHA256 27f380550e2b411f7704779eab6e58360f6aefb0917b09b3c91b39d1dd20dfd8
+MD5 00150e17e4fc2e85b7cd9cd1f1aecd71 ChangeLog 2294
+RMD160 d914a3bc6c388b6ee3ce769e6e6110aceb30c096 ChangeLog 2294
+SHA256 27f380550e2b411f7704779eab6e58360f6aefb0917b09b3c91b39d1dd20dfd8 ChangeLog 2294
 MISC metadata.xml 210 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 SHA1 efa00493ddec7289a21bc4cbcc6e95ec4de749d5 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39
 MD5 c667f921ee8d48ce17ebef0f8d601ea4 metadata.xml 210
 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 metadata.xml 210
@@ -42,3 +49,10 @@ SHA256 e922abdb43909915fa2349c46a6e4ff584891002d523202086b49eac3baebbb7 files/di
 MD5 6bab876e7c0eb53d001c7d2dce0501af files/digest-redland-1.0.4 244
 RMD160 e3f9aff539dece750d92670b0c97edd230fd5be7 files/digest-redland-1.0.4 244
 SHA256 e4285db800f31f8b86b523c198c1d1d79bcc03cd050b374b2c8211486e4743d6 files/digest-redland-1.0.4 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFaaPmamhnQswr0vIRAgrdAJ9AF4SZhlTSdz3N+gB3CAWLQsZYXQCdFoFe
+zAWdQKiUNzggIHeOtHorQOY=
+=Vvep
+-----END PGP SIGNATURE-----
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}
 }