RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Anders F. Björklund
  Root:   /v/rpm/cvs                       Email:  a...@rpm5.org
  Module: rpm                              Date:   05-Jan-2010 12:35:45
  Branch: HEAD                             Handle: 2010010511354400

  Modified files:
    rpm                     devtool.conf
    rpm/rpmdb               Makefile.am

  Log:
    standalone: build without db_sql, for db 4.7

  Summary:
    Revision    Changes     Path
    2.326       +1  -0      rpm/devtool.conf
    1.123       +4  -1      rpm/rpmdb/Makefile.am
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.325 -r2.326 devtool.conf
  --- rpm/devtool.conf  5 Jan 2010 11:32:42 -0000       2.325
  +++ rpm/devtool.conf  5 Jan 2010 11:35:44 -0000       2.326
  @@ -1265,6 +1265,7 @@
           OPTION="$OPTION 
--with-db=\"$base3rd/bin/$platform/db-${v_db}/build_unix\""
           OPTION="$OPTION --with-xz=\"$base3rd/bin/$platform/xz-${v_xz}\""
           OPTION="$OPTION --without-db-rpc"
  +        OPTION="$OPTION --without-db-sql"
           OPTION="$OPTION --without-db-largefile"
           OPTION="$OPTION --with-db-tools-integrated"
           OPTION="$OPTION --with-db-mutex=\"UNIX/fcntl\""
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.122 -r1.123 Makefile.am
  --- rpm/rpmdb/Makefile.am     26 Dec 2009 16:21:58 -0000      1.122
  +++ rpm/rpmdb/Makefile.am     5 Jan 2010 11:35:44 -0000       1.123
  @@ -192,7 +192,10 @@
   logio_SOURCES = logio.c logio.h
   logio_LDADD = $(mylibs)
   
  -BUILT_SOURCES = tagtbl.c tbdb.c bdb.c bdb.h $(logio_BUILT)
  +BUILT_SOURCES = tagtbl.c $(logio_BUILT)
  +if WITH_DB_SQL
  +BUILT_SOURCES += tbdb.c bdb.c bdb.h
  +endif
   
   tjfn_SOURCES = tjfn.c
   tjfn_LDADD = $(mylibs)
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to