diff --git a/mingw-w64-libarchive/PKGBUILD b/mingw-w64-libarchive/PKGBUILD index 76fa333fc1..63d474655c 100644 --- a/mingw-w64-libarchive/PKGBUILD +++ b/mingw-w64-libarchive/PKGBUILD @@ -1,8 +1,10 @@ +# Maintainer: Alexey Pavlov + _realname=libarchive pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=3.2.2 -pkgrel=2 +pkgrel=1 pkgdesc="library that can create and read several streaming archive formats (mingw-w64)" arch=('any') url="http://www.libarchive.org" @@ -12,13 +14,14 @@ depends=(${MINGW_PACKAGE_PREFIX}-gcc-libs ${MINGW_PACKAGE_PREFIX}-bzip2 ${MINGW_PACKAGE_PREFIX}-expat ${MINGW_PACKAGE_PREFIX}-libiconv + ${MINGW_PACKAGE_PREFIX}-lz4 ${MINGW_PACKAGE_PREFIX}-lzo2 ${MINGW_PACKAGE_PREFIX}-libsystre ${MINGW_PACKAGE_PREFIX}-nettle ${MINGW_PACKAGE_PREFIX}-openssl ${MINGW_PACKAGE_PREFIX}-xz ${MINGW_PACKAGE_PREFIX}-zlib) -makedepends=("${MINGW_PACKAGE_PREFIX}-cmake") +#makedepends=("${MINGW_PACKAGE_PREFIX}-cmake") options=('!libtool' 'strip') source=("http://libarchive.org/downloads/${_realname}-${pkgver}.tar.gz" 0001-libarchive-3.2.2-bcrypt-fix.patch) @@ -27,45 +30,31 @@ sha256sums=('691c194ee132d1f0f7a42541f091db811bc2e56f7107e9121be2bc8c04f1060f' prepare() { cd "$srcdir"/${_realname}-${pkgver} - patch -p1 -i ${srcdir}/0001-libarchive-3.2.2-bcrypt-fix.patch + #patch -p1 -i ${srcdir}/0001-libarchive-3.2.2-bcrypt-fix.patch } build() { - cd "$srcdir"/${_realname}-${pkgver} - [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH} - mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH} - - declare -a extra_config - if check_option "debug" "n"; then - extra_config+=("-DCMAKE_BUILD_TYPE=Release") - else - extra_config+=("-DCMAKE_BUILD_TYPE=Debug") - fi - - MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ - ${MINGW_PREFIX}/bin/cmake \ - -G'MSYS Makefiles' \ - -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ - "${extra_config[@]}" \ - -DBUILD_{SHARED,STATIC}_LIBS=ON \ - ../${_realname}-${pkgver} + [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" + mkdir "${srcdir}/build-${MINGW_CHOST}" + cd "${srcdir}/build-${MINGW_CHOST}" + ../${_realname}-${pkgver}/configure \ + --build=${MINGW_CHOST} \ + --host=${MINGW_CHOST} \ + --target=${MINGW_CHOST} \ + --prefix=${MINGW_PREFIX} \ + --with-expat \ + --without-xml2 make } #one test seems to crash #check() { -# cd "${srcdir}"/build-${CARCH} +# cd "${srcdir}"/build-${MINGW_CHOST} # make test #} package() { - cd "${srcdir}"/build-${CARCH} - make install DESTDIR="${pkgdir}" - - local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX}) - # fix python command in files - for _f in "${pkgdir}${MINGW_PREFIX}"/lib/pkgconfig/*.pc; do - sed -e "s|${PREFIX_WIN}/lib|\$\{libdir\}|g" -i ${_f} - done + cd "${srcdir}/build-${MINGW_CHOST}" + make DESTDIR="${pkgdir}" install }