RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 05-Mar-2009 11:01:00
Branch: rpm-5_1 Handle: 2009030510010000
Modified files: (Branch: rpm-5_1)
rpm devtool.conf
Log:
macosx: restore the missing lzma support, that got lost in 5.1.3
(oops)
Summary:
Revision Changes Path
2.205.2.20 +29 -4 rpm/devtool.conf
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.205.2.19 -r2.205.2.20 devtool.conf
--- rpm/devtool.conf 17 Jan 2009 14:31:25 -0000 2.205.2.19
+++ rpm/devtool.conf 5 Mar 2009 10:01:00 -0000 2.205.2.20
@@ -1204,8 +1204,8 @@
## This also requires --disable-dependency-tracking, since it doesn't
## work with multiple -arch flags (see Apple's Technical Note TN2137)
##
- ## These libraries are built internally: db, lua, file, xar
- ## These libraries are statically linked: neon, beecrypt, sqlite, popt
+ ## These libraries are being built internally: db, lua, file, xar
+ ## These are statically linked: lzma, neon, beecrypt, sqlite, popt
## (building popt statically requires that the required popt.h header
## is included within the rpm headers, so that it can be found later)
##
@@ -1406,6 +1406,32 @@
# universal binaries
+ # LZMA (uninstalled third-party library)
+ if [ ! -d "$basemac/bin/lzma-${v_lzma}" ]; then
+ echo "++ building third-party library lzma-${v_lzma}"
+ ( cd $basemac/bin
+ rm -rf lzma-${v_lzma}
+ gzip -d -c ../src/lzma-${v_lzma}.tar.gz | gnutar xf -
+ ( cd lzma-${v_lzma}
+ patch -p0 <../../src/lzma-${v_lzma}.patch
+ CC="$UNIVERSAL_CC" \
+ CPPFLAGS="$UNIVERSAL_CPPFLAGS" \
+ CFLAGS="-O2 -g $UNIVERSAL_CFLAGS" \
+ LDFLAGS="$UNIVERSAL_LDFLAGS" \
+ ./configure $UNIVERSAL_TARGET \
+ --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
+
# Expat (uninstalled third-party library)
if [ ! -d "$basemac/bin/expat-${v_expat}" ]; then
echo "++ building third-party library expat-${v_expat}"
@@ -1612,7 +1638,6 @@
LDFLAGS="$UNIVERSAL_LDFLAGS -Wl,-search_paths_first" # static
LIBS="$LIBS -lssl -lcrypto" # shameless workaround for Neon
LDFLAGS="$LDFLAGS -L`pwd`/xar/lib/.libs" # Xar linking hack
- LDFLAGS="$LDFLAGS -L`pwd`/lzma/src/liblzma/.libs" # LZMA hack
export CPP
export CC
export CXX
@@ -1639,7 +1664,7 @@
--with-zlib=external \
--with-file=internal \
--with-xar=internal \
- --without-lzma \
+ --with-lzma="$basemac/bin/lzma-${v_lzma}" \
--with-neon="$basemac/bin/neon-${v_neon}" \
--with-beecrypt="$basemac/bin/beecrypt-${v_beecrypt}" \
--with-sqlite="$basemac/bin/sqlite-${v_sqlite}" \
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
