wok-6.x rev 15944
Make lzma cross compile and fix libxml2
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Sun Feb 23 00:35:49 2014 +0100 (2014-02-23) |
parents | 159df010240c |
children | c2504719b20a |
files | libxml2/receipt lzlib-dev/receipt lzlib/receipt lzma/receipt |
line diff
1.1 --- a/libxml2/receipt Sat Feb 22 23:10:15 2014 +0100 1.2 +++ b/libxml2/receipt Sun Feb 23 00:35:49 2014 +0100 1.3 @@ -16,8 +16,11 @@ 1.4 1.5 # When cross compiling Python is installed in chroot and is used 1.6 # by cross tools, cook dont need to install it in /usr/cross/arm 1.7 +# Building with LZMA support is buggy and build fails 1.8 case "$ARCH" in 1.9 - arm) BUILD_DEPENDS="" ;; 1.10 + arm) 1.11 + BUILD_DEPENDS="" 1.12 + ARCH_ARGS="--without-lzma" ;; 1.13 esac 1.14 1.15 # Rules to configure and make the package. 1.16 @@ -26,7 +29,6 @@ 1.17 # and binaries are splited into libxml2-tools 1.18 compile_rules() 1.19 { 1.20 - cd $src 1.21 autoreconf -fi 1.22 ./configure \ 1.23 --prefix=/usr \ 1.24 @@ -35,7 +37,7 @@ 1.25 --with-html-dir=/usr/share/doc \ 1.26 --with-threads \ 1.27 --with-history \ 1.28 - $CONFIGURE_ARGS && 1.29 + $CONFIGURE_ARGS $ARCH_ARGS && 1.30 make && 1.31 make DESTDIR=$DESTDIR install 2>&1 | grep -v "can't stat './..html':" 1.32 }
2.1 --- a/lzlib-dev/receipt Sat Feb 22 23:10:15 2014 +0100 2.2 +++ b/lzlib-dev/receipt Sun Feb 23 00:35:49 2014 +0100 2.3 @@ -8,6 +8,7 @@ 2.4 LICENSE="LGPL2.1" 2.5 WEB_SITE="http://sourceforge.net/projects/sevenzip/" 2.6 WANTED="lzma" 2.7 +HOST_ARCH="i486 arm" 2.8 2.9 # Rules to gen a SliTaz package suitable for Tazpkg. 2.10 genpkg_rules()
3.1 --- a/lzlib/receipt Sat Feb 22 23:10:15 2014 +0100 3.2 +++ b/lzlib/receipt Sun Feb 23 00:35:49 2014 +0100 3.3 @@ -9,6 +9,7 @@ 3.4 WEB_SITE="http://sourceforge.net/projects/sevenzip/" 3.5 DEPENDS="zlib gcc-lib-base" 3.6 WANTED="lzma" 3.7 +HOST_ARCH="i486 arm" 3.8 3.9 # Rules to gen a SliTaz package suitable for Tazpkg. 3.10 genpkg_rules()
4.1 --- a/lzma/receipt Sat Feb 22 23:10:15 2014 +0100 4.2 +++ b/lzma/receipt Sun Feb 23 00:35:49 2014 +0100 4.3 @@ -10,51 +10,25 @@ 4.4 WEB_SITE="http://sourceforge.net/projects/sevenzip/" 4.5 WGET_URL="$SF_MIRROR/sevenzip/$TARBALL" 4.6 TAGS="compression archive" 4.7 +HOST_ARCH="i486 arm" 4.8 4.9 DEPENDS="lzlib zlib gcc-lib-base" 4.10 4.11 -# Rules to compile & install the temporary toolchain. 4.12 -cook_tmp_toolchain() 4.13 +# Rules to configure and make the package. 4.14 +compile_rules() 4.15 { 4.16 - # Put & configure the home-script as needed for tmp toolchain. 4.17 - rm /tools/usr/bin/lzma /tools/usr/bin/unlzma /tools/usr/bin/lzcat 4.18 - cp stuff/lzma /tools/usr/bin 4.19 - chmod 755 /tools/usr/bin/lzma 4.20 - ln -s /tools/usr/bin/lzma /tools/usr/bin/unlzma 4.21 - ln -s /tools/usr/bin/lzma /tools/usr/bin/lzcat 4.22 - sed 's~/usr~/tools/usr~' -i /tools/usr/bin/lzma 4.23 - 4.24 - cd $src 4.25 if [ ! -f done.lzlib.u ]; then 4.26 patch -p0 < $stuff/lzlib.u || return 1 4.27 touch done.lzlib.u 4.28 fi 4.29 cd CPP/7zip/Compress/LZMA_Alone 4.30 - 4.31 - # Remove copyright message. 4.32 - sed '/MY_VERSION_COPYRIGHT_DATE/d' -i LzmaAlone.cpp 4.33 - 4.34 - make -f makefile.gcc lzma 2> /dev/null 4.35 - { make -f makefile.gcc liblz.so.1.0.0 && 4.36 - make -f makefile.gcc lzma 4.37 - } || return 1 4.38 - 4.39 - cp -a lzma-shared /tools/usr/bin/lzma-alone 4.40 - cp -a liblz.so.1.0.0 /tools/lib 4.41 - ln -s /tools/lib/liblz.so.1.0.0 /tools/lib/liblz.so 4.42 - ln -s /tools/lib/liblz.so.1.0.0 /tools/lib/liblz.so.1 4.43 -} 4.44 - 4.45 - 4.46 -# Rules to configure and make the package. 4.47 -compile_rules() 4.48 -{ 4.49 - cd $src 4.50 - if [ ! -f done.lzlib.u ]; then 4.51 - patch -p0 < $stuff/lzlib.u || return 1 4.52 - touch done.lzlib.u 4.53 - fi 4.54 - cd CPP/7zip/Compress/LZMA_Alone 4.55 + 4.56 + # Handle cross compilation 4.57 + case "$ARCH" in 4.58 + arm) 4.59 + sed -i s'/g++/arm-slitaz-linux-gnueabi-c++/' makefile.gcc 4.60 + sed -i s'/gcc/arm-slitaz-linux-gnueabi-gcc/' makefile.gcc ;; 4.61 + esac 4.62 4.63 # Remove copyright message. 4.64 sed '/MY_VERSION_COPYRIGHT_DATE/d' -i LzmaAlone.cpp