SOURCES (rpm-4_5): rpm-db3-configure.patch (NEW) - update db3/configure fro...

[glen]

Author: glen                         Date: Wed Sep  3 15:40:02 2008 GMT
Module: SOURCES                       Tag: rpm-4_5
---- Log message:
- update db3/configure from rpm5 trunk

---- Files affected:
SOURCES:
   rpm-db3-configure.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/rpm-db3-configure.patch
diff -u /dev/null SOURCES/rpm-db3-configure.patch:1.1.2.1
--- /dev/null	Wed Sep  3 17:40:02 2008
+++ SOURCES/rpm-db3-configure.patch	Wed Sep  3 17:39:56 2008
@@ -0,0 +1,66 @@
+--- rpm-4.5/db3/configure	2007-05-25 20:35:57.000000000 +0300
++++ trunk/db3/configure	2007-07-01 21:45:10.000000000 +0300
+@@ -7,22 +7,45 @@
+ 
+ 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=.*$%%'`"
+-
+-CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure $ARGS \
+-	--enable-shared --enable-static --enable-rpc \
+-	--with-uniquename=_rpmdb --srcdir=$db_dist
++# 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%--param=.*%%g' \
++           -e 's%--cache-file=.*$%%' \
++           -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%' \
++           -e 's%--without-db-largefile%--disable-largefile%' \
++           -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
++#      as Berkeley-DB "configure" else would not use GNU libtool at all.
++#   2. "--enable-static" is there for enforcing the building of a static
++#      version of the libdb objects RPM actually is interested in.
++
++CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure "$@" \
++	--enable-shared --enable-static \
++	--with-uniquename=_rpmdb --srcdir=$db_dist || exit 1
+ 
+ mv Makefile Makefile.orig
+ cat Makefile.orig | sed -e '/^install[:-]/c\
+-.PHONY: listobjs\
+-listobjs:\
+-\	@echo $(OBJS) $(C_OBJS) \
+-\
+ distdir install check:\
+-\
+-db4_install: all install_setip' > Makefile
++' -e 's/^\(SOFLAGS=\).*$/\1/' > Makefile
+ 
+ mv db.h db.h.orig
+ cat db.h.orig | sed \
+@@ -35,5 +58,3 @@
+ 	-e '/^int txn_commit __P((/a\
+ /*@=declundef =noparams =fcnuse =fielduse =enummemuse =typeuse @*/' > db.h
+ 
+-# Generate manifest for rpmdb.
+-make -s listobjs > db3lobjs
================================================================