RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Mark Hatle
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 01-Jul-2007 20:45:11
Branch: HEAD Handle: 2007070119451000
Modified files:
rpm/db3 configure
Log:
Fix the sed operations, now that we're not dealing with a long string.
(Do we really want to strip out CFLAGS? w/o that the build doesn't
seem to work reliably for me.. so I guess we do.)
Remove the stripping of CC=. If we strip CC= then cross compiling
won't work properly.
Summary:
Revision Changes Path
1.35 +6 -9 rpm/db3/configure
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/db3/configure
============================================================================
$ cvs diff -u -r1.34 -r1.35 configure
--- rpm/db3/configure 1 Jul 2007 18:09:26 -0000 1.34
+++ rpm/db3/configure 1 Jul 2007 18:45:10 -0000 1.35
@@ -13,19 +13,16 @@
set -- "$@" eoa_marker
while [ "$1" != "eoa_marker" ]; do
ARG=`echo "$1" | \
- sed -e 's% [^ ]*CFLAGS=[^ ]*%%' \
- -e 's% [^ ]*CC=[^ ]*ccache [^ ]*%%' \
- -e 's% [^ ]*CC=[^ ]*%%' \
- -e 's% -[^-][^ ]*%%g' \
- -e 's% --param=[^ ]*%%g' \
+ sed -e 's%CFLAGS=.*%%' \
+ -e 's%--param=.*%%g' \
-e 's%--cache-file=.*$%%' \
- -e 's%--with-db-rpc=\([^ ]*\)%--enable-rpc=\1%' \
+ -e 's%--with-db-rpc=\(.*\)%--enable-rpc=\1%' \
-e 's%--with-db-rpc%--enable-rpc%' \
-e 's%--without-db-rpc%--disable-rpc%' \
- -e 's%--with-db-largefile=\([^ ]*\)%--enable-largefile=\1%' \
+ -e 's%--with-db-largefile=\(.*\)%--enable-largefile=\1%' \
-e 's%--with-db-largefile%--enable-largefile%' \
-e 's%--without-db-largefile%--disable-largefile%' \
- -e 's%--with-db-mutex=\([^ ]*\)%--with-mutex=\1%' \
+ -e 's%--with-db-mutex=\(.*\)%--with-mutex=\1%' \
-e 's%--with-db-mutex%%' \
-e 's%--without-db-mutex%%' \
`
@@ -43,7 +40,7 @@
CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure "$@" \
--enable-shared --enable-static \
- --with-uniquename=_rpmdb --srcdir=$db_dist
+ --with-uniquename=_rpmdb --srcdir=$db_dist || exit 1
mv Makefile Makefile.orig
cat Makefile.orig | sed -e '/^install[:-]/c\
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
