diff --git a/packages/compress/zlib/build b/packages/compress/zlib/build index d0969ff357..b29656bb95 100755 --- a/packages/compress/zlib/build +++ b/packages/compress/zlib/build @@ -23,23 +23,8 @@ . config/options $1 cd $PKG_BUILD -rm -rf ./zconf.h # as requested from zlib cmake config -mkdir -p .build-shared && cd .build-shared -cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_SHARED_LIBS=on \ - .. +./configure --prefix=/usr --shared make + $MAKEINSTALL - -# build static library too, because we need this for plymouth-lite -cd .. -mkdir -p .build-static && cd .build-static -cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_SHARED_LIBS=off \ - .. - -make -cp libz.a $SYSROOT_PREFIX/usr/lib \ No newline at end of file diff --git a/packages/compress/zlib/install b/packages/compress/zlib/install index 26bc010bcb..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-shared/*.so* $INSTALL/usr/lib + cp -R $PKG_BUILD/*.so* $INSTALL/usr/lib