summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Ochotnicky <sochotnicky@gentoo.org>2010-04-22 20:59:36 +0000
committerStanislav Ochotnicky <sochotnicky@gentoo.org>2010-04-22 20:59:36 +0000
commit86e6fbcf44b35501aa3b849ded877d7733b723f2 (patch)
treeccbb50e60542e9dce5c67d466b876e6ced9f299b /app-arch/rpm/files
parentFixing manifest wrt bug 316719 (diff)
downloadgentoo-2-86e6fbcf44b35501aa3b849ded877d7733b723f2.tar.gz
gentoo-2-86e6fbcf44b35501aa3b849ded877d7733b723f2.tar.bz2
gentoo-2-86e6fbcf44b35501aa3b849ded877d7733b723f2.zip
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 (Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'app-arch/rpm/files')
-rw-r--r--app-arch/rpm/files/rpm-4.4.6-fix-cflags-stripping.patch14
1 files changed, 14 insertions, 0 deletions
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 \
+