[CVS] RPM: rpm/db3/ configure
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 27-Sep-2010 23:29:38 Branch: HEAD Handle: 2010092721293800 Modified files: rpm/db3 configure Log: - db: enable O_DIRECT (for performance tuning checks). Summary: RevisionChanges Path 1.40+1 -1 rpm/db3/configure patch -p0 <<'@@ .' Index: rpm/db3/configure $ cvs diff -u -r1.39 -r1.40 configure --- rpm/db3/configure 3 Apr 2010 15:53:10 - 1.39 +++ rpm/db3/configure 27 Sep 2010 21:29:38 - 1.40 @@ -43,7 +43,7 @@ # XXX Berkeley DB fails to find a locking scheme if CC=g++ CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure "$@" \ --enable-shared --enable-static \ - --with-crytography=yes \ + --with-crytography=yes --enable-o_direct \ --enable-sql --enable-amalgamation --enable-sql_codegen \ --srcdir=$db_dist || exit 1 @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/db3/ configure
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 03-Apr-2010 17:53:10 Branch: HEAD Handle: 2010040315531000 Modified files: rpm/db3 configure Log: - rpmdb: hot-wire the dbsql options for now, AutoFu retrofit todo++ as needed. - rpmdb: remove --with-uniquename=_rpmdb, the sqlite3 layer can't handle. Summary: RevisionChanges Path 1.39+3 -1 rpm/db3/configure patch -p0 <<'@@ .' Index: rpm/db3/configure $ cvs diff -u -r1.38 -r1.39 configure --- rpm/db3/configure 21 Mar 2010 00:33:16 - 1.38 +++ rpm/db3/configure 3 Apr 2010 15:53:10 - 1.39 @@ -43,7 +43,9 @@ # XXX Berkeley DB fails to find a locking scheme if CC=g++ CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure "$@" \ --enable-shared --enable-static \ - --with-uniquename=_rpmdb --srcdir=$db_dist || exit 1 + --with-crytography=yes \ + --enable-sql --enable-amalgamation --enable-sql_codegen \ + --srcdir=$db_dist || exit 1 mv Makefile Makefile.orig cat Makefile.orig | sed -e '/^install[:-]/c\ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/db3/ configure
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 21-Mar-2010 01:33:17 Branch: HEAD Handle: 2010032100331600 Modified files: rpm/db3 configure Log: - db3: filter CC=foo from input args. add note-to-self explaining why. Summary: RevisionChanges Path 1.38+3 -1 rpm/db3/configure patch -p0 <<'@@ .' Index: rpm/db3/configure $ cvs diff -u -r1.37 -r1.38 configure --- rpm/db3/configure 10 May 2009 18:01:51 - 1.37 +++ rpm/db3/configure 21 Mar 2010 00:33:16 - 1.38 @@ -13,7 +13,8 @@ set -- "$@" eoa_marker while [ "$1" != "eoa_marker" ]; do ARG=`echo "$1" | \ - sed -e 's%CFLAGS=.*%%' \ + sed -e 's%CC=g++%CC=gcc%' \ + -e 's%CFLAGS=.*%%' \ -e 's%--param=.*%%g' \ -e 's%--cache-file=.*$%%' \ -e 's%--with-db-rpc=\(.*\)%--enable-rpc=\1%' \ @@ -39,6 +40,7 @@ # 2. "--enable-static" is there for enforcing the building of a static # version of the libdb objects RPM actually is interested in. +# XXX Berkeley DB fails to find a locking scheme if CC=g++ CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure "$@" \ --enable-shared --enable-static \ --with-uniquename=_rpmdb --srcdir=$db_dist || exit 1 @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/db3/ configure
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 10-May-2009 20:01:51 Branch: HEAD Handle: 2009051018015100 Modified files: rpm/db3 configure Log: - fix: filter out --with-tcl=external before invoking db/dist/configure. Summary: RevisionChanges Path 1.37+1 -1 rpm/db3/configure patch -p0 <<'@@ .' Index: rpm/db3/configure $ cvs diff -u -r1.36 -r1.37 configure --- rpm/db3/configure 6 Apr 2009 20:34:10 - 1.36 +++ rpm/db3/configure 10 May 2009 18:01:51 - 1.37 @@ -23,7 +23,7 @@ -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-tcl%%' \ + -e 's%--with-tcl[^ ]*%%' \ -e 's%--with-db-mutex%%' \ -e 's%--without-db-mutex%%' \ ` @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/db3/ configure
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: RevisionChanges 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 - 1.34 +++ rpm/db3/configure 1 Jul 2007 18:45:10 - 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 Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/db3/ configure
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 01-Jul-2007 20:09:26 Branch: HEAD Handle: 2007070119092600 Modified files: rpm/db3 configure Log: fix the passing-through of the arguments by using "$@" now instead of $ARGS; fix indentation on backticks; use "set --" instead of "set -" as that is the portable construct here (tested in GNU shtool since years). Summary: RevisionChanges Path 1.34+4 -4 rpm/db3/configure patch -p0 <<'@@ .' Index: rpm/db3/configure $ cvs diff -u -r1.33 -r1.34 configure --- rpm/db3/configure 1 Jul 2007 16:12:25 - 1.33 +++ rpm/db3/configure 1 Jul 2007 18:09:26 - 1.34 @@ -10,7 +10,7 @@ # 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 +set -- "$@" eoa_marker while [ "$1" != "eoa_marker" ]; do ARG=`echo "$1" | \ sed -e 's% [^ ]*CFLAGS=[^ ]*%%' \ @@ -28,9 +28,9 @@ -e 's%--with-db-mutex=\([^ ]*\)%--with-mutex=\1%' \ -e 's%--with-db-mutex%%' \ -e 's%--without-db-mutex%%' \ -` + ` shift - set - "$@" "$ARG" + set -- "$@" "$ARG" done shift @@ -41,7 +41,7 @@ # 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 $ARGS \ +CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure "$@" \ --enable-shared --enable-static \ --with-uniquename=_rpmdb --srcdir=$db_dist @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/db3/ configure
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 27-Jun-2007 23:18:48 Branch: HEAD Handle: 2007062722184800 Modified files: rpm/db3 configure Log: do not duplicate the CC on the command line and add a cruel hack to support ccache(1) Summary: RevisionChanges Path 1.32+2 -0 rpm/db3/configure patch -p0 <<'@@ .' Index: rpm/db3/configure $ cvs diff -u -r1.31 -r1.32 configure --- rpm/db3/configure 27 Jun 2007 18:05:12 - 1.31 +++ rpm/db3/configure 27 Jun 2007 21:18:48 - 1.32 @@ -9,6 +9,8 @@ ARGS="`echo $* |\ sed -e 's% [^ ]*CFLAGS=[^ ]*%%' \ + -e 's% [^ ]*CC=[^ ]*ccache [^ ]*%%' \ + -e 's% [^ ]*CC=[^ ]*%%' \ -e 's% -[^-][^ ]*%%g' \ -e 's% --param=[^ ]*%%g' \ -e 's%--cache-file=.*$%%' \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/db3/ configure
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 27-Jun-2007 20:05:12 Branch: HEAD Handle: 2007062719051200 Modified files: rpm/db3 configure Log: after stumbling over this the second time and again wondered, let me add a few comments here, please Summary: RevisionChanges Path 1.31+6 -0 rpm/db3/configure patch -p0 <<'@@ .' Index: rpm/db3/configure $ cvs diff -u -r1.30 -r1.31 configure --- rpm/db3/configure 27 Jun 2007 10:52:35 - 1.30 +++ rpm/db3/configure 27 Jun 2007 18:05:12 - 1.31 @@ -23,6 +23,12 @@ -e 's%--without-db-mutex%%' \ `" +# 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 $ARGS \ --enable-shared --enable-static \ --with-uniquename=_rpmdb --srcdir=$db_dist @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/db3/ configure rpm/rpmdb/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 27-Jun-2007 12:52:35 Branch: HEAD Handle: 2007062711523500 Modified files: rpm/db3 configure rpm/rpmdb Makefile.am Log: More build environment anti-convolution efforts: replace the ugly rpmio/Makefile.am hacks for building a not-to-be-installed db3/libdb.la from rpmio/Makefile (which is done to trick GNU libtool into packing the libdb.la objects into librpmdb.la) with a similar hack, but now at the root of the "problem": Just do not pass option "-rpath" when building libdb-4.5.la. The effect is the same, but the ugly post-tricking is replaced with a simpler root-based solution. Nevertheless, the inclusion of local libraries is still a problem as it is done differently for "db", "lua", and "zlib". More anti-convolution efforts are required here, of course. Summary: RevisionChanges Path 1.30+1 -1 rpm/db3/configure 1.64+4 -10 rpm/rpmdb/Makefile.am patch -p0 <<'@@ .' Index: rpm/db3/configure $ cvs diff -u -r1.29 -r1.30 configure --- rpm/db3/configure 27 Jun 2007 10:37:00 - 1.29 +++ rpm/db3/configure 27 Jun 2007 10:52:35 - 1.30 @@ -30,7 +30,7 @@ mv Makefile Makefile.orig cat Makefile.orig | sed -e '/^install[:-]/c\ distdir install check:\ -' > Makefile +' -e 's/^\(SOFLAGS=\).*$/\1/' > Makefile mv db.h db.h.orig cat db.h.orig | sed \ @@ . patch -p0 <<'@@ .' Index: rpm/rpmdb/Makefile.am $ cvs diff -u -r1.63 -r1.64 Makefile.am --- rpm/rpmdb/Makefile.am 27 Jun 2007 10:13:28 - 1.63 +++ rpm/rpmdb/Makefile.am 27 Jun 2007 10:52:35 - 1.64 @@ -37,9 +37,6 @@ LIBS = -# XXX watchout, ../db3/libdb.la created by this Makefile may surprise -libdb_la = $(top_builddir)/$(WITH_DB_SUBDIR)/libdb.la - usrlibdir = $(libdir)@MARK64@ usrlib_LTLIBRARIES = librpmdb.la librpmdb_la_SOURCES = \ @@ -49,10 +46,11 @@ tagname.c tagtbl.c librpmdb_la_LDFLAGS = -no-undefined -release $(LT_CURRENT).$(LT_REVISION) librpmdb_la_LIBADD = \ - $(DBLIBOBJS) $(libdb_la) \ + $(DBLIBOBJS) \ + $(top_builddir)/$(WITH_DB_SUBDIR)/libdb-4.5.la \ $(top_builddir)/rpmio/librpmio.la \ $(top_builddir)/misc/librpmmisc.la -librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) $(libdb_la) +librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) if HAVE_LD_VERSION_SCRIPT librpmdb_la_LDFLAGS += -Wl,--version-script=$(srcdir)/librpmdb.vers @@ -86,10 +84,6 @@ db.h: @ln -sf ../$(WITH_DB_SUBDIR)/db.h $@ -# XXX grrr, force noinst libdb.la for db3. -$(libdb_la): - sed -e"/^libdir=/s/^.*$$/libdir=''/" < $(top_builddir)/$(WITH_DB_SUBDIR)/libdb-4.5.la > $(libdb_la) - db_archive_SOURCES = db_archive_LDADD = \ $(top_builddir)/$(WITH_DB_SUBDIR)/db_archive.o \ @@ -184,7 +178,7 @@ librpmdb.la clean-local: - rm -f *.o db.h $(libdb_la) + rm -f *.o db.h BUILT_SOURCES = tagtbl.c @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
