From fcf1a7a048efb6a54bcd0b30b36b6f63a3979849 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 19 Jun 2011 13:51:49 +0200 Subject: [PATCH] zlib: build with cmake Signed-off-by: Stephan Raue --- packages/compress/zlib/build | 11 +++++++++-- packages/compress/zlib/install | 2 +- packages/initramfs/compress/zlib-initramfs/install | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/compress/zlib/build b/packages/compress/zlib/build index b29656bb95..4b44b2b650 100755 --- a/packages/compress/zlib/build +++ b/packages/compress/zlib/build @@ -23,8 +23,15 @@ . config/options $1 cd $PKG_BUILD -./configure --prefix=/usr --shared + +# 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 \ + .. make - $MAKEINSTALL diff --git a/packages/compress/zlib/install b/packages/compress/zlib/install index afe2733c0a..e281394a2b 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/*.so* $INSTALL/usr/lib + cp -R $PKG_BUILD/.build-target/*.so* $INSTALL/usr/lib diff --git a/packages/initramfs/compress/zlib-initramfs/install b/packages/initramfs/compress/zlib-initramfs/install index 6c59423c48..a6b4c723e0 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/*.so* $INSTALL/lib + cp -R $ZLIB_DIR/.build-target/*.so* $INSTALL/lib