diff --git a/packages/compress/zlib-host/build b/packages/compress/zlib-host/build index bb37eaa29e..5a31f9905e 100755 --- a/packages/compress/zlib-host/build +++ b/packages/compress/zlib-host/build @@ -28,14 +28,9 @@ setup_toolchain host cd $BUILD/zlib-* -# needed for building with cmake - rm -rf zconf.h +cd zlib-host -mkdir -p .build-host && cd .build-host - -cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=$ROOT/$TOOLCHAIN \ - .. +./configure --prefix=$ROOT/$TOOLCHAIN make make install diff --git a/packages/compress/zlib-host/meta b/packages/compress/zlib-host/meta index aca8853b54..0c039c36e3 100644 --- a/packages/compress/zlib-host/meta +++ b/packages/compress/zlib-host/meta @@ -26,7 +26,7 @@ PKG_LICENSE="OSS" PKG_SITE="http://www.zlib.net" PKG_URL="" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="ccache cmake" +PKG_BUILD_DEPENDS="ccache" PKG_PRIORITY="optional" PKG_SECTION="compress" PKG_SHORTDESC="zlib: A general purpose (ZIP) data compression library" diff --git a/packages/compress/zlib/build b/packages/compress/zlib/build index 4b44b2b650..92303b6af0 100755 --- a/packages/compress/zlib/build +++ b/packages/compress/zlib/build @@ -24,14 +24,8 @@ cd $PKG_BUILD -# needed for building with cmake - rm -rf zconf.h - -mkdir -p .build-target && cd .build-target - -cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - .. +./configure --prefix=/usr make + $MAKEINSTALL diff --git a/packages/compress/zlib/install b/packages/compress/zlib/install index e281394a2b..afe2733c0a 100755 --- a/packages/compress/zlib/install +++ b/packages/compress/zlib/install @@ -23,4 +23,4 @@ . config/options $1 mkdir -p $INSTALL/usr/lib - cp -R $PKG_BUILD/.build-target/*.so* $INSTALL/usr/lib + cp -R $PKG_BUILD/*.so* $INSTALL/usr/lib diff --git a/packages/compress/zlib/meta b/packages/compress/zlib/meta index 9881372fa3..0b8d75061e 100644 --- a/packages/compress/zlib/meta +++ b/packages/compress/zlib/meta @@ -26,7 +26,7 @@ PKG_LICENSE="OSS" PKG_SITE="http://www.zlib.net" PKG_URL="http://www.zlib.net/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain cmake" +PKG_BUILD_DEPENDS="toolchain" PKG_PRIORITY="optional" PKG_SECTION="compress" PKG_SHORTDESC="zlib: A general purpose (ZIP) data compression library" diff --git a/packages/compress/zlib/unpack b/packages/compress/zlib/unpack new file mode 100755 index 0000000000..85da904707 --- /dev/null +++ b/packages/compress/zlib/unpack @@ -0,0 +1,28 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +ZLIB_DIR=`ls -d $PKG_BUILD` + +cp -r "$ZLIB_DIR" "$BUILD/zlib-host" || rm -rf "$BUILD/zlib-host" +mv "$BUILD/zlib-host" "$ZLIB_DIR" diff --git a/packages/initramfs/compress/zlib-initramfs/install b/packages/initramfs/compress/zlib-initramfs/install index a6b4c723e0..6c59423c48 100755 --- a/packages/initramfs/compress/zlib-initramfs/install +++ b/packages/initramfs/compress/zlib-initramfs/install @@ -25,4 +25,4 @@ ZLIB_DIR="$BUILD/zlib-*" mkdir -p $INSTALL/lib - cp -R $ZLIB_DIR/.build-target/*.so* $INSTALL/lib + cp -R $ZLIB_DIR/*.so* $INSTALL/lib