Gentoo Archives: gentoo-commits

From: "Stanislav Ochotnicky (sochotnicky)" <sochotnicky@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-arch/rpm/files: rpm-4.4.6-fix-cflags-stripping.patch
Date: Thu, 22 Apr 2010 20:59:40
Message-Id: 20100422205936.3A70A2C049@corvid.gentoo.org
1 sochotnicky 10/04/22 20:59:36
2
3 Added: rpm-4.4.6-fix-cflags-stripping.patch
4 Log:
5 Fix configure/build error with certain CFLAGS
6
7 db3/configure tried to strip CFLAGS (unsuccesfully) and after doing
8 that it crashed when for example '--param l1-cache-size=64' was used
9 in CFLAGS.
10
11 Should fix bug #315771
12 (Portage version: 2.1.8.3/cvs/Linux i686)
13
14 Revision Changes Path
15 1.1 app-arch/rpm/files/rpm-4.4.6-fix-cflags-stripping.patch
16
17 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/rpm/files/rpm-4.4.6-fix-cflags-stripping.patch?rev=1.1&view=markup
18 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/rpm/files/rpm-4.4.6-fix-cflags-stripping.patch?rev=1.1&content-type=text/plain
19
20 Index: rpm-4.4.6-fix-cflags-stripping.patch
21 ===================================================================
22 diff --git a/db3/configure b/db3/configure
23 index 012b423..2856f20 100755
24 --- a/db3/configure
25 +++ b/db3/configure
26 @@ -8,7 +8,7 @@ db_dist="${base_path}../db/dist"
27 rm -f config.cache
28
29 # XXX edit CFLAGS= ... out of invocation args ???
30 -ARGS="`echo $* | sed -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e 's% --param=[^ ]*%%g' -e 's%--cache-file=.*$%%'`"
31 +ARGS="`echo $* | sed -e 's%--param[ =][^ ]*%%g' -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e 's%--cache-file=.*$%%'`"
32
33 CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure $ARGS \
34 --enable-shared --enable-static --enable-rpc \