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: 09-Oct-2010 03:37:09
Branch: HEAD Handle: 2010100901370603
Modified files:
rpm CHANGES configure.ac devtool.conf
rpm/rpmdb rpmdb.h
rpm/rpmio Makefile.am
Log:
- db: build against external db-5.1.19 using --with-db/--with-dbsql.
Summary:
Revision Changes Path
1.3461 +1 -0 rpm/CHANGES
2.457 +2 -4 rpm/configure.ac
2.351 +2 -2 rpm/devtool.conf
1.141 +1 -1 rpm/rpmdb/rpmdb.h
1.291 +6 -7 rpm/rpmio/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3460 -r1.3461 CHANGES
--- rpm/CHANGES 8 Oct 2010 22:34:10 -0000 1.3460
+++ rpm/CHANGES 9 Oct 2010 01:37:06 -0000 1.3461
@@ -1,4 +1,5 @@
5.3.4 -> 5.4a1:
+ - jbj: db: build against external db-5.1.19 using --with-db/--with-dbsql.
- jbj: rpmlio: disable for now, needs --with-db=internal.
- jbj: db_tool: disable for now, needs --with-db=internal.
- jbj: db: target db-5.1.19 using --with-db=external.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.456 -r2.457 configure.ac
--- rpm/configure.ac 8 Oct 2010 22:34:10 -0000 2.456
+++ rpm/configure.ac 9 Oct 2010 01:37:07 -0000 2.457
@@ -1375,7 +1375,7 @@
RPM_CHECK_LIB(
[Berkeley-DB], [db],
[db-5.1], [db_create], [db51/db.h],
- [yes,external], [db3],
+ [yes,external:internal:none], [db3],
[ DBLIBSRCS="$DBLIBSRCS db3.c"
AM_CONDITIONAL(WITH_DB, [ true ])
AM_CONDITIONAL(WITH_DB_INTERNAL, [ test ".$RPM_CHECK_LIB_LOCATION" =
.internal ])
@@ -1393,12 +1393,10 @@
[])
dnl # Sqlite 3.6.23.1 internal from db-5.0.x
-dnl XXX hot-wire db3/sql (in cvs, but removed by make distclean)
-mkdir -p db3/sql
RPM_CHECK_LIB(
[Berkeley DB SQL], [dbsql],
[db_sql-5.1], [sqlite3_open], [],
- [no,internal:none], [db3/sql],
+ [no,external:internal:none], [db3/sql],
[
AM_CONDITIONAL(WITH_DBSQL, [ true ])
if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.350 -r2.351 devtool.conf
--- rpm/devtool.conf 8 Oct 2010 22:34:10 -0000 2.350
+++ rpm/devtool.conf 9 Oct 2010 01:37:07 -0000 2.351
@@ -83,8 +83,8 @@
--verbose \
--prefix=/usr \
--enable-shared \
- --with-db=internal \
- --with-dbsql=internal \
+ --with-db \
+ --with-dbsql \
--without-db-tools-integrated \
--with-zlib \
--with-bzip2 \
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.h
============================================================================
$ cvs diff -u -r1.140 -r1.141 rpmdb.h
--- rpm/rpmdb/rpmdb.h 6 Mar 2010 16:20:46 -0000 1.140
+++ rpm/rpmdb/rpmdb.h 9 Oct 2010 01:37:08 -0000 1.141
@@ -15,7 +15,7 @@
#if defined(_RPMDB_INTERNAL)
#if defined(WITH_DB)
-#include "db.h"
+#include <db51/db.h>
#else
#include "db_emu.h"
#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
============================================================================
$ cvs diff -u -r1.290 -r1.291 Makefile.am
--- rpm/rpmio/Makefile.am 8 Oct 2010 22:34:12 -0000 1.290
+++ rpm/rpmio/Makefile.am 9 Oct 2010 01:37:09 -0000 1.291
@@ -42,20 +42,19 @@
-I$(top_srcdir)/rpmdb \
-I$(top_srcdir)/rpmio \
-I$(top_srcdir)/misc \
- @WITH_DB_CPPFLAGS@ \
+ @WITH_BEECRYPT_CPPFLAGS@ \
+ @WITH_DBSQL_CPPFLAGS@ \
@WITH_FICL_CPPFLAGS@ \
@WITH_FILE_CPPFLAGS@ \
- @WITH_BEECRYPT_CPPFLAGS@ \
- @WITH_JS_CPPFLAGS@ \
+ @WITH_GPSEE_CPPFLAGS@ \
@WITH_LUA_CPPFLAGS@ \
@WITH_NEON_CPPFLAGS@ \
- @WITH_GPSEE_CPPFLAGS@ \
@WITH_PCRE_CPPFLAGS@ \
+ @WITH_RUBY_CPPFLAGS@ \
@WITH_SYCK_CPPFLAGS@ \
@WITH_XAR_CPPFLAGS@ \
@WITH_XZ_CPPFLAGS@ \
- @WITH_ZLIB_CPPFLAGS@ \
- @WITH_RUBY_CPPFLAGS@
+ @WITH_ZLIB_CPPFLAGS@
AM_CFLAGS = $(OPENMP_CFLAGS)
@@ -119,7 +118,7 @@
endif
if ENABLE_BUILD_MAXEXTLIBDEP
librpmio_la_LDFLAGS += $(LDFLAGS)
-librpmio_la_LIBADD += $(LIBS)
+#librpmio_la_LIBADD += $(LIBS)
endif
#librpmio.la: $(librpmio_la_OBJECTS) $(librpmio_la_DEPENDENCIES)
# $(librpmio_la_LINK) -rpath $(usrlibdir) $(librpmio_la_OBJECTS)
$(librpmio_la_LIBADD)
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
