RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Elan Ruusamäe Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 17-Oct-2009 13:37:27 Branch: rpm-4_5 Handle: 2009101711372501 Modified files: (Branch: rpm-4_5) rpm CHANGES rpm/db3 configure Log: - update db3/configure from rpm5 trunk Summary: Revision Changes Path 1.1360.2.133+1 -0 rpm/CHANGES 1.27.2.1 +34 -13 rpm/db3/configure ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.1360.2.132 -r1.1360.2.133 CHANGES --- rpm/CHANGES 17 Oct 2009 11:35:50 -0000 1.1360.2.132 +++ rpm/CHANGES 17 Oct 2009 11:37:25 -0000 1.1360.2.133 @@ -1,4 +1,5 @@ 4.4.9 -> 4.5: + - glen: update db3/configure from rpm5 trunk - glen: avoid -L poisoning in *.la (qbo...@pld). - glen: fix build with as-needed (needs patched libtool to trigger it) (spa...@pld). - glen: prevent from passing open file descriptors to pre/post scripts (one fd (12?) was terminal, second (11?) .rpm file) (qbo...@pld). @@ . patch -p0 <<'@@ .' Index: rpm/db3/configure ============================================================================ $ cvs diff -u -r1.27 -r1.27.2.1 configure --- rpm/db3/configure 25 May 2007 17:35:57 -0000 1.27 +++ rpm/db3/configure 17 Oct 2009 11:37:26 -0000 1.27.2.1 @@ -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=.*$%%'`" +# 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 -CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure $ARGS \ - --enable-shared --enable-static --enable-rpc \ - --with-uniquename=_rpmdb --srcdir=$db_dist + +# 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 @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
