app-arch/rpm: Fix bug 315771 (build failure with custom CFLAGS)

4 files changed, 31 insertions, 3 deletions

diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index f7d39ac..122ea72 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 901 RMD160 f12b254a2a8c20f53d4ec117283c37a65c70ed73 SHA1 6c7e3e3f347849a678bff6ca40e28e0d134ac687 SHA256 2d5bf983d8a7e1b96f85a97ee02fccf0791dd699392bd7510b4e47fe4eda40f7
 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 3168 RMD160 1f39777473283544a68fa7a28498a854f1f9befa SHA1 ded4bbb34864c5f71524b3154914c8e79ace87a4 SHA256 8c2ba8c1998167eaeb3e00c9255f9e36025e6c0e4f89aa316acccab0be29cbf1
+EBUILD rpm-4.4.6-r7.ebuild 3165 RMD160 2407b4a98438d041f3ea55a1a1b7aedca6239a9e SHA1 70525fd65267f1cde36acbaf0d501ab347f90bdf SHA256 b44ad29dc29ce7205a3b37b747a915496ce518a4921a8fd04031f311d54452f0
 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 7bd4a9458998ca2dc26e509a6fcf625a720ffbeb SHA1 e229e1939589bd73189b669797cf71f18847c69c SHA256 6862fed939a70270c6eb0942d1f390d229d629e10b8eab22603726f7fbe989a0
 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 0000000..bc9cca6
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.4.6-fix-cflags-stripping.patch
@@ -0,0 +1,25 @@
+From 98cb3f66e158d02ce39cd64a62395e3b46e28eb0 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky@gmail.com>
+Date: Thu, 22 Apr 2010 22:28:17 +0200
+Subject: [PATCH] Improved CFLAGS stripping code a bit
+
+---
+ db3/configure |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+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 \
+-- 
+1.6.4.4
+
diff --git a/app-arch/rpm/rpm-4.4.6-r6.ebuild b/app-arch/rpm/rpm-4.4.6-r6.ebuild
index 2f09e97..1e0bbc0 100644
--- a/app-arch/rpm/rpm-4.4.6-r6.ebuild
+++ b/app-arch/rpm/rpm-4.4.6-r6.ebuild
@@ -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 55287e9..c4f61d3 100644
--- a/app-arch/rpm/rpm-4.4.6-r7.ebuild
+++ b/app-arch/rpm/rpm-4.4.6-r7.ebuild
@@ -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