RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: rse@rpm5.org
Module: rpm Date: 11-Nov-2007 16:05:20
Branch: HEAD Handle: 2007111115051702
Modified files:
rpm CHANGES INSTALL Makefile.am autogen.sh
configure.ac devtool.conf
rpm/build Makefile.am
rpm/lib Makefile.am
rpm/misc Makefile.am
rpm/python Makefile.am
rpm/rpmdb Makefile.am
rpm/rpmio Makefile.am
Log:
first cut for properly integrate XAR support into the build
environment
Summary:
Revision Changes Path
1.1804 +1 -0 rpm/CHANGES
2.57 +5 -1 rpm/INSTALL
2.210 +3 -1 rpm/Makefile.am
2.87 +3 -0 rpm/autogen.sh
2.70 +2 -1 rpm/build/Makefile.am
2.247 +11 -0 rpm/configure.ac
2.124 +2 -1 rpm/devtool.conf
2.167 +2 -1 rpm/lib/Makefile.am
1.31 +4 -2 rpm/misc/Makefile.am
1.76 +1 -0 rpm/python/Makefile.am
1.87 +3 -2 rpm/rpmdb/Makefile.am
1.107 +2 -1 rpm/rpmio/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1803 -r1.1804 CHANGES
--- rpm/CHANGES 11 Nov 2007 15:01:05 -0000 1.1803
+++ rpm/CHANGES 11 Nov 2007 15:05:17 -0000 1.1804
@@ -1,4 +1,5 @@
4.5 -> 5.0:
+ - rse: first cut for properly integrate XAR support into the build environment
- rse: allow RPM to be built without XAR support again
- jbj: functional header-only signature verify of *.xar.
- jbj: add --rpmwfdebug.
@@ .
patch -p0 <<'@@ .'
Index: rpm/INSTALL
============================================================================
$ cvs diff -u -r2.56 -r2.57 INSTALL
--- rpm/INSTALL 7 Nov 2007 08:23:41 -0000 2.56
+++ rpm/INSTALL 11 Nov 2007 15:05:17 -0000 2.57
@@ -39,7 +39,8 @@
File/magic [4] optional 4.0 4.21 ftp://ftp.astron.com/pub/file/
GNU gettext optional 0.16 0.17 http://www.gnu.org/software/gettext/
GNU iconv optional 1.11 1.11 http://www.gnu.org/software/libiconv/
-PCRE optional 7.0 7.4 http://www.pcre.org/
+PCRE [5] optional 7.0 7.4 http://www.pcre.org/
+XAR optional 1.6 1.6 http://code.google.com/p/xar/
DMalloc optional 5 5.5.2 http://dmalloc.com/
Electric Fence optional 2.1 2.1.13 http://perens.com/FreeSoftware/ElectricFence/
Linux KeyUtils optional 1.2 1.2 http://people.redhat.com/~dhowells/keyutils/
@@ -63,6 +64,9 @@
Building RPM against this internal File/magic requires also internal Zlib.
Building RPM against stock external File/magic supported, too.
+[5] xar: Modified XAR copy bundled with RPM.
+ Building RPM against stock external XAR currently still not recommended.
+
Run-Time
--------
@@ .
patch -p0 <<'@@ .'
Index: rpm/Makefile.am
============================================================================
$ cvs diff -u -r2.209 -r2.210 Makefile.am
--- rpm/Makefile.am 12 Oct 2007 17:59:50 -0000 2.209
+++ rpm/Makefile.am 11 Nov 2007 15:05:17 -0000 2.210
@@ -47,6 +47,7 @@
@WITH_ZLIB_SUBDIR@ \
@WITH_LUA_SUBDIR@ \
@WITH_FILE_SUBDIR@ \
+ @WITH_XAR_SUBDIR@ \
misc \
rpmio \
rpmdb \
@@ -71,7 +72,8 @@
@WITH_DB_CPPFLAGS@ \
@WITH_ZLIB_CPPFLAGS@ \
@WITH_LUA_CPPFLAGS@ \
- @WITH_FILE_CPPFLAGS@
+ @WITH_FILE_CPPFLAGS@ \
+ @WITH_XAR_CPPFLAGS@
myLDADD = \
$(top_builddir)/build/librpmbuild.la \
@@ .
patch -p0 <<'@@ .'
Index: rpm/autogen.sh
============================================================================
$ cvs diff -u -r2.86 -r2.87 autogen.sh
--- rpm/autogen.sh 24 Jul 2007 09:53:51 -0000 2.86
+++ rpm/autogen.sh 11 Nov 2007 15:05:17 -0000 2.87
@@ -41,6 +41,9 @@
echo "===> file"
( cd file && sh ./autogen.sh --noconfigure "$@" )
echo "<=== file"
+echo "===> xar"
+( cd xar && sh ./autogen.sh --noconfigure "$@" )
+echo "<=== xar"
echo "===> rpm"
rm -rf autom4te.cache || true
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/Makefile.am
============================================================================
$ cvs diff -u -r2.69 -r2.70 Makefile.am
--- rpm/build/Makefile.am 29 Jul 2007 14:02:33 -0000 2.69
+++ rpm/build/Makefile.am 11 Nov 2007 15:05:18 -0000 2.70
@@ -17,7 +17,8 @@
@WITH_DB_CPPFLAGS@ \
@WITH_ZLIB_CPPFLAGS@ \
@WITH_LUA_CPPFLAGS@ \
- @WITH_FILE_CPPFLAGS@
+ @WITH_FILE_CPPFLAGS@ \
+ @WITH_XAR_CPPFLAGS@
pkgincdir = $(pkgincludedir)$(WITH_PATH_VERSIONED_SUFFIX)
pkginc_HEADERS = rpmbuild.h rpmspec.h
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.246 -r2.247 configure.ac
--- rpm/configure.ac 1 Nov 2007 22:12:40 -0000 2.246
+++ rpm/configure.ac 11 Nov 2007 15:05:17 -0000 2.247
@@ -989,6 +989,17 @@
fi
], [])
+dnl # XAR
+RPM_CHECK_LIB(
+ [XAR], [xar],
+ [xar], [xar_open], [xar.h],
+ [no,internal:external:none], [xar:include:lib],
+ [ if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
+ AC_DEFINE(HAVE_XAR_H, 1, [Have <xar.h> header])
+ fi
+ AC_MSG_WARN([XAR support is highly experimental])
+ ], [])
+
dnl # DMalloc
RPM_CHECK_LIB(
[DMalloc], [dmalloc],
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.123 -r2.124 devtool.conf
--- rpm/devtool.conf 11 Nov 2007 14:38:21 -0000 2.123
+++ rpm/devtool.conf 11 Nov 2007 15:05:17 -0000 2.124
@@ -3,11 +3,12 @@
##
%common
- MODULE_NAMES="db lua zlib file"
+ MODULE_NAMES="db lua zlib file xar"
MODULE_TAG_DB=""
MODULE_TAG_LUA=""
MODULE_TAG_ZLIB=""
MODULE_TAG_FILE=""
+ MODULE_TAG_XAR=""
%checkout
for name in $MODULE_NAMES "$@"; do
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/Makefile.am
============================================================================
$ cvs diff -u -r2.166 -r2.167 Makefile.am
--- rpm/lib/Makefile.am 30 Sep 2007 22:38:28 -0000 2.166
+++ rpm/lib/Makefile.am 11 Nov 2007 15:05:18 -0000 2.167
@@ -15,7 +15,8 @@
@WITH_DB_CPPFLAGS@ \
@WITH_ZLIB_CPPFLAGS@ \
@WITH_LUA_CPPFLAGS@ \
- @WITH_FILE_CPPFLAGS@
+ @WITH_FILE_CPPFLAGS@ \
+ @WITH_XAR_CPPFLAGS@
EXTRA_DIST = getdate.y librpm.vers
@@ .
patch -p0 <<'@@ .'
Index: rpm/misc/Makefile.am
============================================================================
$ cvs diff -u -r1.30 -r1.31 Makefile.am
--- rpm/misc/Makefile.am 26 Jul 2007 08:10:31 -0000 1.30
+++ rpm/misc/Makefile.am 11 Nov 2007 15:05:19 -0000 1.31
@@ -31,13 +31,15 @@
@WITH_DB_LDFLAGS@ \
@WITH_ZLIB_LDFLAGS@ \
@WITH_LUA_LDFLAGS@ \
- @WITH_FILE_LDFLAGS@
+ @WITH_FILE_LDFLAGS@ \
+ @WITH_XAR_LDFLAGS@
librpmmisc_la_LIBADD = \
@ALLOCA@ \
@WITH_DB_LIBS@ \
@WITH_ZLIB_LIBS@ \
@WITH_LUA_LIBS@ \
- @WITH_FILE_LIBS@
+ @WITH_FILE_LIBS@ \
+ @WITH_XAR_LIBS@
if ENABLE_BUILD_EXTLIBDEP
librpmmisc_la_LDFLAGS += $(LDFLAGS)
librpmmisc_la_LIBADD += $(LIBS)
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/Makefile.am
============================================================================
$ cvs diff -u -r1.75 -r1.76 Makefile.am
--- rpm/python/Makefile.am 21 Jul 2007 19:16:50 -0000 1.75
+++ rpm/python/Makefile.am 11 Nov 2007 15:05:19 -0000 1.76
@@ -22,6 +22,7 @@
@WITH_ZLIB_CPPFLAGS@ \
@WITH_LUA_CPPFLAGS@ \
@WITH_FILE_CPPFLAGS@ \
+ @WITH_XAR_CPPFLAGS@ \
-I$(pyincdir)
noinst_HEADERS = header-py.h \
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/Makefile.am
============================================================================
$ cvs diff -u -r1.86 -r1.87 Makefile.am
--- rpm/rpmdb/Makefile.am 10 Nov 2007 19:35:59 -0000 1.86
+++ rpm/rpmdb/Makefile.am 11 Nov 2007 15:05:19 -0000 1.87
@@ -15,7 +15,8 @@
@WITH_DB_CPPFLAGS@ \
@WITH_ZLIB_CPPFLAGS@ \
@WITH_LUA_CPPFLAGS@ \
- @WITH_FILE_CPPFLAGS@
+ @WITH_FILE_CPPFLAGS@ \
+ @WITH_XAR_CPPFLAGS@
EXTRA_DIST = db3.c sqlite.c db_emu.h librpmdb.vers
@@ -55,7 +56,7 @@
endif
if ENABLE_BUILD_MAXEXTLIBDEP
librpmdb_la_LDFLAGS += $(LDFLAGS)
-librpmdb_la_LIBADD += $(LIBS) -lxar
+librpmdb_la_LIBADD += $(LIBS)
endif
librpmdb_la_DEPENDENCIES = $(DBLIBOBJS)
librpmdb.la: $(librpmdb_la_OBJECTS) $(librpmdb_la_DEPENDENCIES)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
============================================================================
$ cvs diff -u -r1.106 -r1.107 Makefile.am
--- rpm/rpmio/Makefile.am 28 Aug 2007 20:00:07 -0000 1.106
+++ rpm/rpmio/Makefile.am 11 Nov 2007 15:05:19 -0000 1.107
@@ -19,7 +19,8 @@
@WITH_DB_CPPFLAGS@ \
@WITH_ZLIB_CPPFLAGS@ \
@WITH_LUA_CPPFLAGS@ \
- @WITH_FILE_CPPFLAGS@
+ @WITH_FILE_CPPFLAGS@ \
+ @WITH_XAR_CPPFLAGS@
RPM_LDADD = \
$(top_builddir)/build/librpmbuild.la \
@@ .
Received on Sun Nov 11 16:05:20 2007