From 040fdaa7bf2ff0b155ae4f184c96b7f41a254455 Mon Sep 17 00:00:00 2001 From: jagannatharjun <34717789+jagannatharjun@users.noreply.github.com> Date: Wed, 6 Jun 2018 11:07:44 +0530 Subject: [PATCH] Update ZSTD 1.3.4 (#3900) * Update ZSTD 1.3.4 * Change TAB to SPACES --- mingw-w64-zstd/PKGBUILD | 50 +++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/mingw-w64-zstd/PKGBUILD b/mingw-w64-zstd/PKGBUILD index c2a0a5d1b9..204c43eb2e 100644 --- a/mingw-w64-zstd/PKGBUILD +++ b/mingw-w64-zstd/PKGBUILD @@ -3,39 +3,51 @@ _realname=zstd pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.1.2 +pkgver=1.3.4 pkgrel=1 pkgdesc="Zstandard - Fast real-time compression algorithm (mingw-w64)" arch=('any') url='https://facebook.github.io/zstd/' license=('BSD') -makedepends=("${MINGW_PACKAGE_PREFIX}-gcc") -source=(${_realname}-${pkgver}.tar.gz::"https://github.com/facebook/${_realname}/archive/v${pkgver}.tar.gz" - "makefile-install.patch" - "pzstd-c++11.patch") -sha256sums=('980b8febb0118e22f6ed70d23b5b3e600995dbf7489c1f6d6122c1411cdda8d8' - 'b80af0d89a51555e96281446fa7c5ae1ee2543a001fa6ec140a41f93c4c8e1e0' - '34c2872388f04a835dbf99db8c6c945d2f451470703b9f66e4c718dcf84373cf') - +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" + "${MINGW_PACKAGE_PREFIX}-cmake") +source=(${_realname}-${pkgver}.tar.gz::"https://github.com/facebook/${_realname}/archive/v${pkgver}.tar.gz") +sha256sums=('92e41b6e8dd26bbd46248e8aa1d86f1551bc221a796277ae9362954f26d605a9') prepare() { cd "${srcdir}/${_realname}-${pkgver}" - patch -p1 -i "${srcdir}/makefile-install.patch" - patch -p1 -i "${srcdir}/pzstd-c++11.patch" + } build() { - cd "${srcdir}/${_realname}-${pkgver}" - make clean && make - make -C contrib/pzstd clean && make -C contrib/pzstd + 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[@]}" \ + ../${_realname}-${pkgver}/build/cmake + + make } + package() { - cd "${srcdir}/${_realname}-${pkgver}" - - make DESTDIR="${pkgdir}" PREFIX="${MINGW_PREFIX}" install - install -D -m755 "contrib/pzstd/pzstd" "${pkgdir}${MINGW_PREFIX}/bin/pzstd" + cd "${srcdir}"/build-${CARCH} + make install DESTDIR="${pkgdir}" + cd "${srcdir}"/${_realname}-${pkgver} install -D -m644 "LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" - install -D -m644 "PATENTS" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/PATENTS" + }