diff --git a/mingw-w64-abinit/001-fix-build-on-mingw.patch b/mingw-w64-abinit/001-fix-build-on-mingw.patch index 6fde602d67..7f717290be 100644 --- a/mingw-w64-abinit/001-fix-build-on-mingw.patch +++ b/mingw-w64-abinit/001-fix-build-on-mingw.patch @@ -9,6 +9,20 @@ set_target_properties(abinit::wannier PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${WANNIER_INCLUDE_DIR}" +--- a/cmake/generate_config_h.cmake ++++ b/cmake/generate_config_h.cmake +@@ -210,8 +210,10 @@ + + # check async + try_compile(HAVE_FC_ASYNC_BOOL ${CMAKE_BINARY_DIR}/try_compile ${CMAKE_SOURCE_DIR}/cmake/try_compile/have_fc_async.F90) +-if (HAVE_FC_ASYNC_BOOL) ++if (HAVE_FC_ASYNC_BOOL AND NOT MINGW) + set(HAVE_FC_ASYNC 1) ++else() ++ set(HAVE_FC_ASYNC 0) + endif() + + # check backtrace --- a/shared/common/src/CMakeLists.txt +++ b/shared/common/src/CMakeLists.txt @@ -25,6 +25,6 @@ diff --git a/mingw-w64-abinit/003-fix-version.patch b/mingw-w64-abinit/003-fix-version.patch index 45f884f44f..b767b4f46b 100644 --- a/mingw-w64-abinit/003-fix-version.patch +++ b/mingw-w64-abinit/003-fix-version.patch @@ -5,7 +5,7 @@ project(abinit LANGUAGES C CXX Fortran - VERSION 9.11.0 -+ VERSION 10.0.5 ++ VERSION 10.0.9 HOMEPAGE_URL https://www.abinit.org/ DESCRIPTION "ABINIT is an atomic-scale simulation software suite.") diff --git a/mingw-w64-abinit/PKGBUILD b/mingw-w64-abinit/PKGBUILD index 706a90d8fc..4e0da97f52 100644 --- a/mingw-w64-abinit/PKGBUILD +++ b/mingw-w64-abinit/PKGBUILD @@ -3,8 +3,8 @@ _realname=abinit pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=10.0.5 -pkgrel=2 +pkgver=10.0.9 +pkgrel=1 pkgdesc="Atomic-scale simulation software. (mingw-w64)" arch=('any') mingw_arch=('ucrt64') @@ -30,14 +30,14 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-msmpi" "${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-wannier90") -source=("https://www.abinit.org/sites/default/files/packages/${_realname}-${pkgver}.tar.gz" +source=("https://forge.abinit.org/${_realname}-${pkgver}.tar.gz" "001-fix-build-on-mingw.patch" "002-fix-pkgconfig-file.patch" "003-fix-version.patch") -sha256sums=('07fed4df03ae32178933373b990bbda4431ea836fc7bebec05b17e4267bb7f4e' - 'eb4db135a0d01a0e5624aca081817b6a66ef433933331d0bd89e3c9ee8fd2b18' +sha256sums=('17650580295e07895f6c3c4b1f3f0fe0e0f3fea9bab5fd8ce7035b16a62f8e5e' + '41ee6253fffc56503ebf2a11ddc5016f67fb014717588b28eedd9381af96399d' '466f7f86384f02c99e9f7a948f2b38229a10962ff849cd1e8bf06b0c6ddd7481' - 'c17be9dc3e3b4f2dd84fbb4133daba4a8ac84240aea487ee0790850fc7e51538') + '72f10de92d58e54ffc814ff03956ca1db89e92c893b9896b774a29f0abff516f') prepare() { cd "${srcdir}"/${_realname}-${pkgver} @@ -55,10 +55,12 @@ build() { _extra_config+=("-DCMAKE_BUILD_TYPE=Debug") fi + FFLAGS="-O2" \ MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=;-DPYMOD_INSTALL_LIBDIR=" \ "${MINGW_PREFIX}"/bin/cmake.exe -Wno-dev \ -GNinja \ -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \ + -DCMAKE_C_STANDARD=17 \ "${_extra_config[@]}" \ -DBLA_VENDOR=OpenBLAS \ -DWANNIER_ROOT=${MINGW_PREFIX} \