Fix configure/build error with certain CFLAGS

db3/configure tried to strip CFLAGS (unsuccesfully) and after doing
that it crashed when for example '--param l1-cache-size=64' was used
in CFLAGS.

Should fix bug #315771
Package-Manager: portage-2.1.8.3/cvs/Linux i686

5 files changed, 28 insertions, 6 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index ae64ef18161b..728e3c208875 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/rpm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.108 2010/04/15 10:27:53 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.109 2010/04/22 20:59:35 sochotnicky Exp $
+
+  22 Apr 2010; Stanislav Ochotnicky <sochotnicky@gentoo.org>
+  rpm-4.4.6-r6.ebuild, rpm-4.4.6-r7.ebuild,
+  +files/rpm-4.4.6-fix-cflags-stripping.patch:
+  Fix configure/build failure when using certain CFLAGS.
 
 *rpm-4.4.6-r7 (15 Apr 2010)
 
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index f7d39ac5479e..5f328ee4c17b 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,5 +1,6 @@
 AUX rpm-4.4.6-autotools.patch 660 RMD160 63155d3737ffdf9927b1763ddf068c5964e168c9 SHA1 70dd2346df0e5d95ec4a06587485381b48d52b81 SHA256 dd4828899e760358b702d0c2ca75e781619f7b65140cf2cc5600ea687a085569
 AUX rpm-4.4.6-buffer-overflow.patch 1952 RMD160 468c71731ec6893de165b4e1047f85f5b240f2f7 SHA1 dc41417f4064eb9476de9ef51e616042e55e5f73 SHA256 6ae715632dabd6cc6c24a92312ac22c1bd57235ff2f027f68943df68dcfc957b
+AUX rpm-4.4.6-fix-cflags-stripping.patch 594 RMD160 a13c8d5d98ef6820bf41e6b4cbfe6f9d06545e8a SHA1 1f88f28a7a4df450768447087189c48bfc3fdefa SHA256 d1138a2b80797da7244ff1917178c104b56926f38708b0149be57f06e99233da
 AUX rpm-4.4.6-neon-0.28.patch 2393 RMD160 7cc24ef31e46682bffa57721e18299c4a9b74637 SHA1 14dd947d44150caa89b58991ed7dbdd358152c3e SHA256 e7b9c177a4ff8027f731ae54b2d6a836ea7be3e6eca92b704dbe30b33b8166c4
 AUX rpm-4.4.6-qa-fix-undefined.patch 553 RMD160 647b19a10c86850873d65b5a65c2530d5a44ed54 SHA1 75e1bb924ed57f3b0ef7776551c3d782a9121904 SHA256 1c72bb60b4c9af6b0c366debe7276f948308e777ff6fef090bb778d9bc724a06
 AUX rpm-4.4.6-stupidness.patch 4992 RMD160 d8f0e831599a72e6224e19a568fffadd999ebc4a SHA1 317f19c9f181ca2cd40d832536c458884bb5b279 SHA256 84af6ddab50982e15df90d2c7895ecd0f0b568caa6cd0af57ce33e1af784b4a7
@@ -10,9 +11,9 @@ AUX rpm-4.4.7-stupidness.patch 5268 RMD160 631f1bf3dc4553e27dec4a901fa84e17ffc7c
 DIST rpm-4.4.6.tar.gz 17157249 RMD160 6b433d20a63fb2542244ae62eff0a8b5fe290439 SHA1 33221f95189671d1a083b4f140bcf9a88ecd4374 SHA256 1e1da50af2b9dfe34c79315eae7520e7e57087671e17ce26107d779ae2b0b595
 DIST rpm-4.4.7.tar.gz 14125623 RMD160 9002eb0fe1d680d8bff447d6918f9726c9a4e34c SHA1 b119fb0f10fd5e2eb330ba547b6a89e40f3c0e68 SHA256 18fde4195e4ac21a4290327336948f8c4fc58a680395edbb5f2f31bae67b18b5
 DIST rpm-5.1.6.tar.gz 8305612 RMD160 88645f4a7c2e25fffaa5628d267e86eaac137b35 SHA1 3ab7d1edf333102c748c22e9144ab90d9719ab0b SHA256 82ee1a737bd77ddd90b0fe1e9a2f478c46033e451fac3881d00ab9e166951799
-EBUILD rpm-4.4.6-r6.ebuild 3114 RMD160 cbc807cb63ae226264ccb9c510e8bcb5d3b03a9e SHA1 5e84cf6271557816c7413d1c08a866ab2deece27 SHA256 6202075986b80ce56b95001968fe4182bc9c4b149d0df453791c2bc88efcdbd6
-EBUILD rpm-4.4.6-r7.ebuild 3111 RMD160 4bffce5bc3f5e29d158d46790f1813d48d08b5e4 SHA1 ccd0974e2c459fee6a67d13bf40d1ba1bcf771df SHA256 15e3afd2d141e7a9cb1b6e968d6ed3c7331ca206f04e2eea89224178b10f7b0d
+EBUILD rpm-4.4.6-r6.ebuild 3171 RMD160 44fbdb341ab87a74fc13c2eef87d9070338bb1c9 SHA1 31106589361bf7991986eac88c598e51b1fce6ff SHA256 95a2af02a614aa8abd1c50f2674576f2e81e3bf2b5962104a6e717b8403d0dd5
+EBUILD rpm-4.4.6-r7.ebuild 3165 RMD160 0cdc36998e3929662e978ffe71dfa44ed5da3ee4 SHA1 57274f71bc40d755797d4f9e10be59ab6eb8be7f SHA256 07c6bfd5f211f06ef5e1a53ae2fcf6a5ffa81430995e4ebfc947c0f320e79e13
 EBUILD rpm-4.4.7-r4.ebuild 3083 RMD160 c5c835de374335f3cd2847aaf1a72d07e1fba37a SHA1 b183ebe5f6ffa6979045b2f406772a76de13cc43 SHA256 f0204575b60ef2e97963d1951f43869e4c7814a99b64ac1980453ead7e737022
 EBUILD rpm-5.1.6.ebuild 2946 RMD160 ceba21a3805e60ac63e12046eeaa58d4961f21a6 SHA1 e9d8c000729f4fca443904a9859864a13546acfe SHA256 c5dfd0023beffbedd16248aa27a439bc53ff22abc9f89d804480a0fe6b5a372f
-MISC ChangeLog 16558 RMD160 b3d1f118984964ed771dbec55dec4c651771c830 SHA1 cf4c5051ad64905de8aba72b82996cb4c6ba90e5 SHA256 4bae13360038a5f3a4f5939477af6a9835f8d899370500caa61936f88d1542bf
+MISC ChangeLog 16768 RMD160 ea683d023904633d30ba278ed6bae948d97e4bd0 SHA1 3bd25700e9fb065f15750d5db51f3ddec31a0714 SHA256 00af63b8dd7fbcf03f08b48bbf41a2a00594e75dbf9e597830016fdfd7554e34
 MISC metadata.xml 396 RMD160 5370081b5c621536cf1043f44c0b6d45051dc895 SHA1 b5dbf8427940398fef39ed6ecf44fc40ab79a261 SHA256 c202b9189a05829f811129efd19db92cdc3ea04161472e4bb1011be344b4935d
diff --git a/app-arch/rpm/files/rpm-4.4.6-fix-cflags-stripping.patch b/app-arch/rpm/files/rpm-4.4.6-fix-cflags-stripping.patch
new file mode 100644
index 000000000000..3be0c1fb1513
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.4.6-fix-cflags-stripping.patch
@@ -0,0 +1,14 @@
+diff --git a/db3/configure b/db3/configure
+index 012b423..2856f20 100755
+--- a/db3/configure
++++ b/db3/configure
+@@ -8,7 +8,7 @@ db_dist="${base_path}../db/dist"
+ rm -f config.cache
+ 
+ # XXX edit CFLAGS= ... out of invocation args ???
+-ARGS="`echo $* | sed -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e 's% --param=[^ ]*%%g' -e 's%--cache-file=.*$%%'`"
++ARGS="`echo $* | sed -e 's%--param[ =][^ ]*%%g' -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g'  -e 's%--cache-file=.*$%%'`"
+ 
+ CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure $ARGS \
+ 	--enable-shared --enable-static --enable-rpc \
+
diff --git a/app-arch/rpm/rpm-4.4.6-r6.ebuild b/app-arch/rpm/rpm-4.4.6-r6.ebuild
index 2f09e9773380..40474987c8f2 100644
--- a/app-arch/rpm/rpm-4.4.6-r6.ebuild
+++ b/app-arch/rpm/rpm-4.4.6-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.6-r6.ebuild,v 1.11 2010/04/04 21:48:31 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.6-r6.ebuild,v 1.12 2010/04/22 20:59:35 sochotnicky Exp $
 
 inherit eutils autotools distutils perl-module flag-o-matic
 
@@ -38,6 +38,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-autotools.patch
 	epatch "${FILESDIR}"/${P}-buffer-overflow.patch
 	epatch "${FILESDIR}"/${P}-qa-fix-undefined.patch
+	epatch "${FILESDIR}"/${P}-fix-cflags-stripping.patch
 	# bug 214799
 	epatch "${FILESDIR}"/${P}-neon-0.28.patch
 
diff --git a/app-arch/rpm/rpm-4.4.6-r7.ebuild b/app-arch/rpm/rpm-4.4.6-r7.ebuild
index 55287e9a9741..97b5d9752702 100644
--- a/app-arch/rpm/rpm-4.4.6-r7.ebuild
+++ b/app-arch/rpm/rpm-4.4.6-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.6-r7.ebuild,v 1.1 2010/04/15 10:26:11 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.6-r7.ebuild,v 1.2 2010/04/22 20:59:35 sochotnicky Exp $
 
 inherit eutils autotools distutils perl-module flag-o-matic
 
@@ -38,6 +38,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-autotools.patch
 	epatch "${FILESDIR}"/${P}-buffer-overflow.patch
 	epatch "${FILESDIR}"/${P}-qa-fix-undefined.patch
+	epatch "${FILESDIR}"/${P}-fix-cflags-stripping.patch
 	# bug 214799
 	epatch "${FILESDIR}"/${P}-neon-0.28.patch