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 18:12:25
Branch: HEAD Handle: 2007070117122500
Modified files:
rpm CHANGES
rpm/db3 configure
Log:
change db3 configure wrapper to process one argument at a time
Summary:
Revision Changes Path
1.1420 +1 -0 rpm/CHANGES
1.33 +12 -2 rpm/db3/configure
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1419 -r1.1420 CHANGES
--- rpm/CHANGES 30 Jun 2007 15:55:06 -0000 1.1419
+++ rpm/CHANGES 1 Jul 2007 16:12:25 -0000 1.1420
@@ -1,4 +1,5 @@
4.5 -> 5.0:
+ - mgh: change db3 configure wrapper to process one argument at a time
- rse: add SQLite RPM DB support for "tmpdir=<path> excl
cachesize=<bytes> pagesize=<bytes> temporary private perms=<bitmask>"
- mgh: allow rpm to be built w/o neon
- rse: remove unused rpmio/sexp/ sub-library
@@ .
patch -p0 <<'@@ .'
Index: rpm/db3/configure
============================================================================
$ cvs diff -u -r1.32 -r1.33 configure
--- rpm/db3/configure 27 Jun 2007 21:18:48 -0000 1.32
+++ rpm/db3/configure 1 Jul 2007 16:12:25 -0000 1.33
@@ -7,7 +7,12 @@
rm -f config.cache
-ARGS="`echo $* |\
+# We iterate over the argument list. Processing the arguments using
+# echo "$*" can fail with the sed chopping out parts of unrelated
+# arguments
+set - "$@" eoa_marker
+while [ "$1" != "eoa_marker" ]; do
+ ARG=`echo "$1" | \
sed -e 's% [^ ]*CFLAGS=[^ ]*%%' \
-e 's% [^ ]*CC=[^ ]*ccache [^ ]*%%' \
-e 's% [^ ]*CC=[^ ]*%%' \
@@ -23,7 +28,12 @@
-e 's%--with-db-mutex=\([^ ]*\)%--with-mutex=\1%' \
-e 's%--with-db-mutex%%' \
-e 's%--without-db-mutex%%' \
-`"
+`
+ shift
+ set - "$@" "$ARG"
+done
+shift
+
# NOTICE:
# 1. "--enable-shared" is there for enforcing GNU libtool usage only
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
