RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 15-Apr-2009 14:15:52
Branch: HEAD Handle: 2009041512155101
Modified files:
rpm CHANGES
rpm/lib rpmds.c
rpm/rpmio rpmio.c xzdio.c
Log:
place XZ code under WITH_XZ (RPM_CHECK_LIB based) instead of HAVE_LZMA_H
(standard Autoconf header check)
Summary:
Revision Changes Path
1.2932 +1 -0 rpm/CHANGES
2.149 +2 -2 rpm/lib/rpmds.c
1.189 +6 -6 rpm/rpmio/rpmio.c
1.12 +1 -1 rpm/rpmio/xzdio.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2931 -r1.2932 CHANGES
--- rpm/CHANGES 15 Apr 2009 12:12:45 -0000 1.2931
+++ rpm/CHANGES 15 Apr 2009 12:15:51 -0000 1.2932
@@ -1,5 +1,6 @@
5.2a4 -> 5.2b1:
+ - rse: place XZ code under WITH_XZ (RPM_CHECK_LIB based) instead of
HAVE_LZMA_H (standard Autoconf header check)
- rse: place BZip2 code under WITH_BZIP2 (RPM_CHECK_LIB based) instead
of HAVE_BZLIB_H (standard Autoconf header check)
- rse: RPM_CHECK_LIB: support --with-<name>=system to enable a library
but control detection via flags only
- rse: let Lua's lregex_lposix to build against PCRE POSIX out of the box
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmds.c
============================================================================
$ cvs diff -u -r2.148 -r2.149 rpmds.c
--- rpm/lib/rpmds.c 15 Apr 2009 12:12:46 -0000 2.148
+++ rpm/lib/rpmds.c 15 Apr 2009 12:15:51 -0000 2.149
@@ -1500,7 +1500,7 @@
{ "rpmlib(PayloadIsUstar)", "4.4.4-1",
(RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
N_("package payload can be in ustar tar archive format.") },
-#if defined(HAVE_LZMA_H)
+#if defined(WITH_XZ)
{ "rpmlib(PayloadIsLzma)", "4.4.6-1",
(RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
N_("package payload can be compressed using lzma.") },
@@ -1516,7 +1516,7 @@
(RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
N_("package payload can be in ar archive format.") },
#endif
-#if defined(HAVE_LZMA_H)
+#if defined(WITH_XZ)
{ "rpmlib(PayloadIsXz)", "5.2-1",
(RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
N_("package payload can be compressed using xz.") },
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmio.c
============================================================================
$ cvs diff -u -r1.188 -r1.189 rpmio.c
--- rpm/rpmio/rpmio.c 15 Apr 2009 12:12:46 -0000 1.188
+++ rpm/rpmio/rpmio.c 15 Apr 2009 12:15:52 -0000 1.189
@@ -58,7 +58,7 @@
# include <netinet/in_systm.h>
#endif
-#if defined(HAVE_LZMA_H)
+#if defined(WITH_XZ)
#include <lzma.h>
#endif
@@ -216,7 +216,7 @@
} else if (fps->io == bzdio) {
sprintf(be, "BZD %p fdno %d", fps->fp, fps->fdno);
#endif
-#if defined(HAVE_LZMA_H)
+#if defined(WITH_XZ)
} else if (fps->io == lzdio) {
sprintf(be, "LZD %p fdno %d", fps->fp, fps->fdno);
} else if (fps->io == xzdio) {
@@ -2332,7 +2332,7 @@
} else
#endif
-#ifdef HAVE_LZMA_H
+#if defined(WITH_XZ)
if (fdGetIo(fd) == lzdio) {
errstr = fd->errcookie;
} else
@@ -2662,7 +2662,7 @@
fd = iof->_fdopen(fd, zstdio);
/*...@=internalglobs@*/
#endif
-#if defined(HAVE_LZMA_H)
+#if defined(WITH_XZ)
} else if (!strcmp(end, "lzdio")) {
iof = lzdio;
fd = iof->_fdopen(fd, zstdio);
@@ -2836,7 +2836,7 @@
if (vh && fdGetIo(fd) == bzdio && bzdio->_flush != NULL)
return (*bzdio->_flush) ((void *)fd);
#endif
-#if defined(HAVE_LZMA_H)
+#if defined(WITH_XZ)
if (vh && fdGetIo(fd) == lzdio && lzdio->_flush != NULL)
return (*lzdio->_flush) ((void *)fd);
if (vh && fdGetIo(fd) == xzdio && xzdio->_flush != NULL)
@@ -2873,7 +2873,7 @@
ec = (fd->syserrno || fd->errcookie != NULL) ? -1 : 0;
i--; /* XXX fdio under bzdio always has fdno == -1 */
#endif
-#if defined(HAVE_LZMA_H)
+#if defined(WITH_XZ)
} else if (fps->io == lzdio) {
ec = (fd->syserrno || fd->errcookie != NULL) ? -1 : 0;
i--; /* XXX fdio under lzdio always has fdno == -1 */
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/xzdio.c
============================================================================
$ cvs diff -u -r1.11 -r1.12 xzdio.c
--- rpm/rpmio/xzdio.c 11 Mar 2009 14:13:22 -0000 1.11
+++ rpm/rpmio/xzdio.c 15 Apr 2009 12:15:52 -0000 1.12
@@ -8,7 +8,7 @@
#include <rpmmacro.h>
#include <rpmcb.h>
-#if defined(HAVE_LZMA_H)
+#if defined(WITH_XZ)
/* provide necessary defines for inclusion of <lzma.h>
similar to LZMAUtils's internal <common.h> and as
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
