For the record: I have negative interest in carrying around liblzma
internal
to rpm sources.
Meanwhile, "internal" is needed in the short term to stabilize a LZMA
payload format
using -llzma. It's impossible to keep up with unreleased alpha quaility
code without having a reference implementation internal to rpm.
73 de Jeff
On Apr 28, 2008, at 12:40 PM, Jeff Johnson wrote:
> RPM Package Manager, CVS Repository
> http://rpm5.org/cvs/
>
> ______________________________________________________________________
> ______
>
> Server: rpm5.org Name: Jeff Johnson
> Root: /v/rpm/cvs Email: jbj@rpm5.org
> Module: rpm Date: 28-Apr-2008
> 18:40:29
> Branch: HEAD Handle: 2008042816402800
>
> Modified files:
> rpm CHANGES autogen.sh configure.ac
> devtool.conf
> rpm/misc Makefile.am
>
> Log:
> - jbj: preliminary support for internal -lzma (non-functional
> atm).
> - jbj: add lzma checkout to devtool system target.
>
> Summary:
> Revision Changes Path
> 1.2309 +2 -0 rpm/CHANGES
> 2.92 +3 -0 rpm/autogen.sh
> 2.296 +7 -2 rpm/configure.ac
> 2.215 +3 -1 rpm/devtool.conf
> 1.33 +2 -0 rpm/misc/Makefile.am
>
> ______________________________________________________________________
> ______
>
> patch -p0 <<'@@ .'
> Index: rpm/CHANGES
>
> ======================================================================
> ======
> $ cvs diff -u -r1.2308 -r1.2309 CHANGES
> --- rpm/CHANGES 28 Apr 2008 16:37:19 -0000 1.2308
> +++ rpm/CHANGES 28 Apr 2008 16:40:28 -0000 1.2309
> @@ -1,5 +1,7 @@
>
> 5.1.0 -> 5.2a0:
> + - jbj: preliminary support for internal -lzma (non-
> functional atm).
> + - jbj: add lzma checkout to devtool system target.
> - jbj: disable loop unraveling error msgs for now. better
> needs to be done.
> - jbj: permit firefox debugging by creating an empty dir
> (#444310).
> - afb/rse: add initial "devtool standalone" and Autoconf
> support for building against LZMA Utils
> @@ .
> patch -p0 <<'@@ .'
> Index: rpm/autogen.sh
>
> ======================================================================
> ======
> $ cvs diff -u -r2.91 -r2.92 autogen.sh
> --- rpm/autogen.sh 9 Apr 2008 12:31:52 -0000 2.91
> +++ rpm/autogen.sh 28 Apr 2008 16:40:28 -0000 2.92
> @@ -38,6 +38,9 @@
> echo "===> zlib"
> ( cd zlib && sh ./autogen.sh --noconfigure "$@" )
> echo "<=== zlib"
> +echo "===> lzma"
> +( cd lzma && sh ./autogen.sh --noconfigure "$@" )
> +echo "<=== lzma"
> echo "===> file"
> ( cd file && sh ./autogen.sh --noconfigure "$@" )
> echo "<=== file"
> @@ .
> patch -p0 <<'@@ .'
> Index: rpm/configure.ac
>
> ======================================================================
> ======
> $ cvs diff -u -r2.295 -r2.296 configure.ac
> --- rpm/configure.ac 26 Apr 2008 16:12:45 -0000 2.295
> +++ rpm/configure.ac 28 Apr 2008 16:40:28 -0000 2.296
> @@ -961,8 +961,13 @@
> RPM_CHECK_LIB(
> [LZMA Utils], [lzma],
> [lzma], [lzma_init], [lzma.h],
> - [no,external:none], [],
> - [], [])
> + [no,external:internal:none], [lzma:src:src],
> + [ AC_CHECK_FUNC(lzma_init)
> + if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
> + WITH_LZMA_INTERNAL=true
> + AC_DEFINE(HAVE_LZMA_H, 1, [Define to 1 if you have
> <lzma.h>])
> + fi
> + ], [])
>
> dnl # BeeCrypt
> RPM_CHECK_LIB(
> @@ .
> patch -p0 <<'@@ .'
> Index: rpm/devtool.conf
>
> ======================================================================
> ======
> $ cvs diff -u -r2.214 -r2.215 devtool.conf
> --- rpm/devtool.conf 26 Apr 2008 16:14:15 -0000 2.214
> +++ rpm/devtool.conf 28 Apr 2008 16:40:28 -0000 2.215
> @@ -3,12 +3,13 @@
> ##
>
> %common
> - MODULE_NAMES="db lua zlib file xar"
> + MODULE_NAMES="db lua zlib file xar lzma"
> MODULE_TAG_DB=""
> MODULE_TAG_LUA=""
> MODULE_TAG_ZLIB=""
> MODULE_TAG_FILE=""
> MODULE_TAG_XAR=""
> + MODULE_TAG_LZMA=""
>
> %checkout
> for name in $MODULE_NAMES "$@"; do
> @@ -70,6 +71,7 @@
> --with-db=internal \
> --with-db-tools-integrated \
> --with-zlib=internal \
> + --with-lzma=internal \
> --with-file=internal \
> --with-lua=internal \
> --with-sqlite=external \
> @@ .
> patch -p0 <<'@@ .'
> Index: rpm/misc/Makefile.am
>
> ======================================================================
> ======
> $ cvs diff -u -r1.32 -r1.33 Makefile.am
> --- rpm/misc/Makefile.am 12 Nov 2007 08:04:05 -0000 1.32
> +++ rpm/misc/Makefile.am 28 Apr 2008 16:40:28 -0000 1.33
> @@ -31,6 +31,7 @@
> librpmmisc_la_LDFLAGS += \
> @WITH_DB_LDFLAGS@ \
> @WITH_ZLIB_LDFLAGS@ \
> + @WITH_LZMA_LDFLAGS@ \
> @WITH_LUA_LDFLAGS@ \
> @WITH_FILE_LDFLAGS@ \
> @WITH_XAR_LDFLAGS@
> @@ -38,6 +39,7 @@
> @ALLOCA@ \
> @WITH_DB_LIBS@ \
> @WITH_ZLIB_LIBS@ \
> + @WITH_LZMA_LIBS@ \
> @WITH_LUA_LIBS@ \
> @WITH_FILE_LIBS@ \
> @WITH_XAR_LIBS@
> @@ .
> ______________________________________________________________________
> RPM Package Manager http://rpm5.org
> CVS Sources Repository rpm-cvs@rpm5.org
Received on Mon Apr 28 18:44:26 2008