From a40ae08a239f15a39bbfdc7eca6f229da99a5bba Mon Sep 17 00:00:00 2001 From: Mehdi Chinoune Date: Thu, 18 Aug 2022 12:54:00 +0000 Subject: [PATCH] trilinos: update to 13.4.0 --- mingw-w64-trilinos/PKGBUILD | 46 ++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/mingw-w64-trilinos/PKGBUILD b/mingw-w64-trilinos/PKGBUILD index b20b179575..a7b3862789 100644 --- a/mingw-w64-trilinos/PKGBUILD +++ b/mingw-w64-trilinos/PKGBUILD @@ -8,7 +8,7 @@ _realname=trilinos pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=13.2.0 +pkgver=13.4.0 _pkgver=${pkgver//./-} pkgrel=1 pkgdesc='Algorithms for the solution of large-scale scientific problems" (mingw-w64)' @@ -17,39 +17,47 @@ mingw_arch=('mingw32' 'mingw64' 'ucrt64') depends=("${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-openblas" "${MINGW_PACKAGE_PREFIX}-boost" - "${MINGW_PACKAGE_PREFIX}-netcdf" - "${MINGW_PACKAGE_PREFIX}-matio" - "${MINGW_PACKAGE_PREFIX}-hdf5" - "${MINGW_PACKAGE_PREFIX}-msmpi") + "${MINGW_PACKAGE_PREFIX}-netcdf" + "${MINGW_PACKAGE_PREFIX}-matio" + "${MINGW_PACKAGE_PREFIX}-hdf5" + "${MINGW_PACKAGE_PREFIX}-msmpi") makedepends=("unzip" "${MINGW_PACKAGE_PREFIX}-msmpi" "${MINGW_PACKAGE_PREFIX}-perl" "${MINGW_PACKAGE_PREFIX}-ninja" - "${MINGW_PACKAGE_PREFIX}-openblas" + "${MINGW_PACKAGE_PREFIX}-openblas" "${MINGW_PACKAGE_PREFIX}-cmake" - "${MINGW_PACKAGE_PREFIX}-bc" - "${MINGW_PACKAGE_PREFIX}-python-numpy") + "${MINGW_PACKAGE_PREFIX}-bc" + "${MINGW_PACKAGE_PREFIX}-python-numpy") checkdepends=("${MINGW_PACKAGE_PREFIX}-cmake") optdepends=("${MINGW_PACKAGE_PREFIX}-seacas") license=('LGPL3') url="http://trilinos.org" -source=("https://github.com/${_realname}/Trilinos/archive/refs/tags/${_realname}-release-${_pkgver}.zip") -sha256sums=('5224AD60B94FC1100A616A5AA37F14E4673FEAEFC94451751AF2A0E672029D2D') -noextract=("${_realname}-release-${_pkgver}.zip") # bsdtar could not unpack this archive +source=("https://github.com/${_realname}/Trilinos/archive/refs/tags/${_realname}-release-${_pkgver}.tar.gz") +sha256sums=('39550006e059043b7e2177f10467ae2f77fe639901aee91cbc1e359516ff8d3e') +noextract=(${_realname}-release-${_pkgver}.tar.gz) -prepare() { - unzip -oq trilinos-release-$_pkgver.zip -d ${srcdir} +prepare(){ + plain "Extract ${_realname}-release-${_pkgver}.tar.gz" + tar -xzf ${_realname}-release-${_pkgver}.tar.gz || true } build() { - [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" - mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}" + [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}" + mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" + + 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 \ -GNinja \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ - -DCMAKE_BUILD_TYPE=Release \ + ${extra_config[@]} \ -DBLAS_LIBRARY_NAMES="openblas" \ -DLAPACK_LIBRARY_NAMES="openblas" \ -DMPI_USE_COMPILER_WRAPPERS=ON \ @@ -66,7 +74,7 @@ build() { } package() { - cd "${srcdir}/build-${MINGW_CHOST}" - DESTDIR=${pkgdir} cmake --build . --target install - install -Dm644 ${srcdir}/Trilinos-${_realname}-release-${_pkgver}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE + cd "${srcdir}/build-${MSYSTEM}" + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install . + install -Dm644 "${srcdir}"/Trilinos-${_realname}-release-${_pkgver}/LICENSE "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE }