RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 26-Apr-2008 18:12:45
Branch: HEAD Handle: 2008042616124500
Modified files:
rpm CHANGES configure.ac devtool.conf
Log:
add initial "devtool standalone" and Autoconf support for building
against LZMA Utils
Summary:
Revision Changes Path
1.2306 +1 -0 rpm/CHANGES
2.295 +7 -0 rpm/configure.ac
2.213 +28 -0 rpm/devtool.conf
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2305 -r1.2306 CHANGES
--- rpm/CHANGES 26 Apr 2008 12:26:00 -0000 1.2305
+++ rpm/CHANGES 26 Apr 2008 16:12:45 -0000 1.2306
@@ -1,5 +1,6 @@
5.1.0 -> 5.2a0:
+ - afb/rse: add initial "devtool standalone" and Autoconf support for
building against LZMA Utils
- jbj: add --enable-build-gcov for CFLAGS -fprofile-arcs -ftest-coverage.
- jbj: header: free tag data on error retrurn with damaged data.
- rpm.org: rpmsw: insure that time has passed while calibrating
(#435309).
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.294 -r2.295 configure.ac
--- rpm/configure.ac 26 Apr 2008 12:26:00 -0000 2.294
+++ rpm/configure.ac 26 Apr 2008 16:12:45 -0000 2.295
@@ -957,6 +957,13 @@
[no,external:none], [],
[], [])
+dnl # LZMA Utils
+RPM_CHECK_LIB(
+ [LZMA Utils], [lzma],
+ [lzma], [lzma_init], [lzma.h],
+ [no,external:none], [],
+ [], [])
+
dnl # BeeCrypt
RPM_CHECK_LIB(
[BeeCrypt], [beecrypt],
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.212 -r2.213 devtool.conf
--- rpm/devtool.conf 17 Apr 2008 06:32:39 -0000 2.212
+++ rpm/devtool.conf 26 Apr 2008 16:12:45 -0000 2.213
@@ -217,6 +217,7 @@
# third-party library distribution versions
v_zlib="1.2.3"
v_bzip2="1.0.5"
+ v_lzma="4.999.3alpha"
v_openssl="0.9.8g"
v_expat="2.0.1"
v_neon="0.28.1"
@@ -241,6 +242,7 @@
dist="${dist}
gettext-${v_gettext}.tar.gz,http://rpm5.org/files/3rd/,ftp://ftp.gnu.org/gnu/gettext/";
dist="${dist}
zlib-${v_zlib}.tar.gz,http://rpm5.org/files/3rd/,http://www.zlib.net/";
dist="${dist}
bzip2-${v_bzip2}.tar.gz,http://rpm5.org/files/3rd/,http://www.bzip.org/${v_bzip2}/";
+ dist="${dist}
lzma-${v_lzma}.tar.gz,http://rpm5.org/files/3rd/,http://tukaani.org/lzma/";
dist="${dist}
openssl-${v_openssl}.tar.gz,http://rpm5.org/files/3rd/,ftp://ftp.openssl.org/source/";
dist="${dist}
expat-${v_expat}.tar.gz,http://rpm5.org/files/3rd/,http://switch.dl.sourceforge.net/expat/";
dist="${dist}
neon-${v_neon}.tar.gz,http://rpm5.org/files/3rd/,http://www.webdav.org/neon/";
@@ -268,6 +270,7 @@
dist="${dist} libxml2-${v_libxml2}.patch,http://rpm5.org/files/3rd/";
dist="${dist} xar-${v_xar}.patch,http://rpm5.org/files/3rd/";
dist="${dist} pcre-${v_pcre}.patch,http://rpm5.org/files/3rd/";
+ dist="${dist} lzma-${v_lzma}.patch,http://rpm5.org/files/3rd/";
dist="${dist} config.guess-${v_config},http://rpm5.org/files/3rd/";
dist="${dist} config.sub-${v_config},http://rpm5.org/files/3rd/";
}
@@ -544,6 +547,29 @@
) || exit $?
fi
+ # LZMA (uninstalled third-party library)
+ if [ ! -d "$base3rd/bin/$platform/lzma-${v_lzma}" ]; then
+ echo "++ building third-party library lzma-${v_lzma}"
+ ( cd $base3rd/bin/$platform
+ rm -rf lzma-${v_lzma}
+ $gzip -d -c ../../src/lzma-${v_lzma}.tar.gz | $tar xf -
+ ( cd lzma-${v_lzma}
+ $patch -p0 <../../../src/lzma-${v_lzma}.patch
+ CC="$cc" \
+ ./configure \
+ --without-libiconv-prefix \
+ --without-libintl-prefix \
+ --disable-assembler \
+ --disable-nls \
+ --disable-shared
+ ( cd src/liblzma && make )
+ ln -s src/liblzma/api/lzma .
+ ln -s src/liblzma/api/lzma.h .
+ ln -s src/liblzma/.libs/liblzma.a .
+ ) || exit $?
+ ) || exit $?
+ fi
+
# OpenSSL (uninstalled third-party library)
if [ ! -d "$base3rd/bin/$platform/openssl-${v_openssl}" ]; then
echo "++ building third-party library openssl-${v_openssl}"
@@ -895,6 +921,7 @@
CPPFLAGS="$CPPFLAGS -DRPM_INTEGRITY_FP=\\\"$RPM_INTEGRITY_FP\\\""
CPPFLAGS="$CPPFLAGS -DRPM_INTEGRITY_MV=\\\"$RPM_INTEGRITY_MV\\\""
fi
+
LDFLAGS="$LDFLAGS -L$base3rd/bin/$platform/openssl-${v_openssl}"
# shameless workaround for Neon/XAR
LDFLAGS="$LDFLAGS
-L$base3rd/bin/$platform/libxml2-${v_libxml2}/.libs" # shameless workaround for
XAR
LDFLAGS="$LDFLAGS -L$base3rd/bin/$platform/zlib-${v_zlib}"
# shameless workaround for XAR
@@ -934,6 +961,7 @@
OPTION="$OPTION --with-xar=\"$base3rd/bin/$platform/xar-${v_xar}\""
OPTION="$OPTION
--with-sqlite=\"$base3rd/bin/$platform/sqlite-${v_sqlite}\""
OPTION="$OPTION
--with-db=\"$base3rd/bin/$platform/db-${v_db}/build_unix\""
+ OPTION="$OPTION
--with-lzma=\"$base3rd/bin/$platform/lzma-${v_lzma}\""
OPTION="$OPTION --without-db-rpc"
OPTION="$OPTION --without-db-largefile"
OPTION="$OPTION --with-db-tools-integrated"
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
