projects / packages / rpm.git / blame
| Commit | Line | Data |
|---|---|---|
| 5e900665 ER |
1 | --- rpm-4.5/db3/configure 2007-05-25 20:35:57.000000000 +0300 |
| 2 | +++ trunk/db3/configure 2007-07-01 21:45:10.000000000 +0300 | |
| 3 | @@ -7,22 +7,45 @@ | |
| 4 | ||
| 5 | rm -f config.cache | |
| 6 | ||
| 7 | -# XXX edit CFLAGS= ... out of invocation args ??? | |
| 8 | -ARGS="`echo $* | sed -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e 's% --param=[^ ]*%%g' -e 's%--cache-file=.*$%%'`" | |
| 9 | - | |
| 10 | -CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure $ARGS \ | |
| 11 | - --enable-shared --enable-static --enable-rpc \ | |
| 12 | - --with-uniquename=_rpmdb --srcdir=$db_dist | |
| 13 | +# We iterate over the argument list. Processing the arguments using | |
| 14 | +# echo "$*" can fail with the sed chopping out parts of unrelated | |
| 15 | +# arguments | |
| 16 | +set -- "$@" eoa_marker | |
| 17 | +while [ "$1" != "eoa_marker" ]; do | |
| 18 | + ARG=`echo "$1" | \ | |
| 19 | + sed -e 's%CFLAGS=.*%%' \ | |
| 20 | + -e 's%--param=.*%%g' \ | |
| 21 | + -e 's%--cache-file=.*$%%' \ | |
| 22 | + -e 's%--with-db-rpc=\(.*\)%--enable-rpc=\1%' \ | |
| 23 | + -e 's%--with-db-rpc%--enable-rpc%' \ | |
| 24 | + -e 's%--without-db-rpc%--disable-rpc%' \ | |
| 25 | + -e 's%--with-db-largefile=\(.*\)%--enable-largefile=\1%' \ | |
| 26 | + -e 's%--with-db-largefile%--enable-largefile%' \ | |
| 27 | + -e 's%--without-db-largefile%--disable-largefile%' \ | |
| 28 | + -e 's%--with-db-mutex=\(.*\)%--with-mutex=\1%' \ | |
| 29 | + -e 's%--with-db-mutex%%' \ | |
| 30 | + -e 's%--without-db-mutex%%' \ | |
| 31 | + ` | |
| 32 | + shift | |
| 33 | + set -- "$@" "$ARG" | |
| 34 | +done | |
| 35 | +shift | |
| 36 | + | |
| 37 | + | |
| 38 | +# NOTICE: | |
| 39 | +# 1. "--enable-shared" is there for enforcing GNU libtool usage only | |
| 40 | +# as Berkeley-DB "configure" else would not use GNU libtool at all. | |
| 41 | +# 2. "--enable-static" is there for enforcing the building of a static | |
| 42 | +# version of the libdb objects RPM actually is interested in. | |
| 43 | + | |
| 44 | +CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure "$@" \ | |
| 45 | + --enable-shared --enable-static \ | |
| 46 | + --with-uniquename=_rpmdb --srcdir=$db_dist || exit 1 | |
| 47 | ||
| 48 | mv Makefile Makefile.orig | |
| 49 | cat Makefile.orig | sed -e '/^install[:-]/c\ | |
| 50 | -.PHONY: listobjs\ | |
| 51 | -listobjs:\ | |
| 52 | -\ @echo $(OBJS) $(C_OBJS) \ | |
| 53 | -\ | |
| 54 | distdir install check:\ | |
| 55 | -\ | |
| 56 | -db4_install: all install_setip' > Makefile | |
| 57 | +' -e 's/^\(SOFLAGS=\).*$/\1/' > Makefile | |
| 58 | ||
| 59 | mv db.h db.h.orig | |
| 60 | cat db.h.orig | sed \ | |
| 61 | @@ -35,5 +58,3 @@ | |
| 62 | -e '/^int txn_commit __P((/a\ | |
| 63 | /*@=declundef =noparams =fcnuse =fielduse =enummemuse =typeuse @*/' > db.h | |
| 64 | ||
| 65 | -# Generate manifest for rpmdb. | |
| 66 | -make -s listobjs > db3lobjs |