Merge pull request #10916 from MehdiChinoune/fix-rt-deps-7

Fix runtime dependencies (7/n)
2022-03-05 18:48:52 +01:00
parent 61ce6f7769 b24d9e5957
commit e9868aa2fd
10 changed files with 80 additions and 63 deletions
--- a/mingw-w64-libshout/PKGBUILD
+++ b/mingw-w64-libshout/PKGBUILD
@@ -4,7 +4,7 @@ _realname=libshout
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.4.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for accessing a shoutcast/icecast server (mingw-w64)"
 arch=(any)
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -13,7 +13,8 @@ license=('LGPL')
 depends=("${MINGW_PACKAGE_PREFIX}-libvorbis"
         "${MINGW_PACKAGE_PREFIX}-libtheora"
         "${MINGW_PACKAGE_PREFIX}-openssl"
-         "${MINGW_PACKAGE_PREFIX}-speex")
+         "${MINGW_PACKAGE_PREFIX}-speex"
+         "${MINGW_PACKAGE_PREFIX}-libwinpthread-git")
 makedepends=("${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-cc")
 source=("https://downloads.xiph.org/releases/${_realname}/${_realname}-${pkgver}.tar.gz"
        0001-dont-hate-yourself_m4.all.patch
@@ -46,8 +47,9 @@ prepare() {
 }

 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}
+
  ../${_realname}-${pkgver}/configure \
    --prefix=${MINGW_PREFIX} \
    --build=${MINGW_CHOST} \
@@ -60,11 +62,11 @@ build() {
 }

 check() {
-  cd ${srcdir}/build-${MINGW_CHOST}
+  cd ${srcdir}/build-${MSYSTEM}
  make -k check || true
 }

 package() {
-  cd ${srcdir}/build-${MINGW_CHOST}
+  cd ${srcdir}/build-${MSYSTEM}
  make DESTDIR="${pkgdir}" install
 }
--- a/mingw-w64-libsidplayfp/PKGBUILD
+++ b/mingw-w64-libsidplayfp/PKGBUILD
@@ -4,14 +4,15 @@ _realname=libsidplayfp
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=2.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A library to play Commodore 64 music (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url="https://github.com/libsidplayfp/libsidplayfp"
 license=("GPL")
 depends=("${MINGW_PACKAGE_PREFIX}-libftdi"
-          "${MINGW_PACKAGE_PREFIX}-libgcrypt")
+         "${MINGW_PACKAGE_PREFIX}-libgcrypt"
+         "${MINGW_PACKAGE_PREFIX}-libwinpthread-git")
 makedepends=("${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-cc")
 options=('staticlibs' 'strip')
 source=("https://github.com/libsidplayfp/libsidplayfp/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.gz")
@@ -24,8 +25,8 @@ prepare() {
 }

 build() {
-  [[ -d ${srcdir}/build-${CARCH} ]] && rm -rf ${srcdir}/build-${CARCH}
-  mkdir -p "${srcdir}/build-${CARCH}" && cd "${srcdir}/build-${CARCH}"
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"

  ../${_realname}-${pkgver}/configure \
    --prefix=${MINGW_PREFIX} \
@@ -39,12 +40,12 @@ build() {
 }

 check() {
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
  make check
 }

 package() {
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
  make DESTDIR="${pkgdir}" install

  install -Dm644 ${srcdir}/${_realname}-${pkgver}/README ${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}/README
--- a/mingw-w64-libssh/PKGBUILD
+++ b/mingw-w64-libssh/PKGBUILD
@@ -4,7 +4,7 @@ _realname=libssh
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.9.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for accessing ssh client services through C libraries (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -16,7 +16,8 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-pkg-config"
             "${MINGW_PACKAGE_PREFIX}-ninja"
             "${MINGW_PACKAGE_PREFIX}-cc")
 depends=("${MINGW_PACKAGE_PREFIX}-openssl"
-         "${MINGW_PACKAGE_PREFIX}-zlib")
+         "${MINGW_PACKAGE_PREFIX}-zlib"
+         "${MINGW_PACKAGE_PREFIX}-libwinpthread-git")
 options=('staticlibs' 'strip')
 validpgpkeys=('8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D') # Andreas Schneider <asn@cryptomilk.org>
 source=("https://www.libssh.org/files/${pkgver%.*}/${_realname}-${pkgver}.tar.xz"{,.asc}
@@ -37,6 +38,9 @@ prepare() {
 }

 build() {
+  [[ -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")
@@ -44,9 +48,6 @@ build() {
    _extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
  fi

-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
-
  MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
  ${MINGW_PREFIX}/bin/cmake.exe \
    -G"Ninja" \
@@ -62,13 +63,13 @@ build() {
 }

 check() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
  ${MINGW_PREFIX}/bin/ctest.exe ./ || true
 }

 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
-  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
+  cd "${srcdir}/build-${MSYSTEM}"
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install .

  local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
  for _f in "${pkgdir}${MINGW_PREFIX}"/lib/cmake/libssh/*.cmake; do
--- a/mingw-w64-libvoikko/PKGBUILD
+++ b/mingw-w64-libvoikko/PKGBUILD
@@ -4,14 +4,15 @@ _realname=libvoikko
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=4.3.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A spelling and grammar checker, hyphenator and collection of related linguistic data for Finnish language (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://voikko.sourceforge.io/"
 license=('GPL2')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
-         "${MINGW_PACKAGE_PREFIX}-libssp")
+         "${MINGW_PACKAGE_PREFIX}-libssp"
+         "${MINGW_PACKAGE_PREFIX}-libwinpthread-git")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-cc")
 source=("https://www.puimula.org/voikko-sources/${_realname}/${_realname}-${pkgver}.tar.gz"{,.asc})
 sha256sums=('368240d4cfa472c2e2c43dc04b63e6464a3e6d282045848f420d0f7a6eb09a13'
@@ -26,8 +27,8 @@ prepare() {
 }

 build() {
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}

  # Workaround encoding error
  export LANG="en_US.UTF-8"
@@ -47,7 +48,7 @@ build() {
 }

 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
  make install DESTDIR="${pkgdir}"

  local _pyver=$(${MINGW_PREFIX}/bin/python.exe -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
--- a/mingw-w64-libvpx/PKGBUILD
+++ b/mingw-w64-libvpx/PKGBUILD
@@ -4,12 +4,13 @@ _realname=libvpx
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.11.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The VP8/VP9 Codec SDK (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 license=('BSD')
-makedepends=("${MINGW_PACKAGE_PREFIX}-yasm" "${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-cc")
+depends=("${MINGW_PACKAGE_PREFIX}-libwinpthread-git")
+makedepends=("${MINGW_PACKAGE_PREFIX}-yasm" "${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-gcc")
 url="https://www.webmproject.org/"
 source=(${_realname}-${pkgver}.tar.gz::https://github.com/webmproject/libvpx/archive/v${pkgver}.tar.gz
        0001-enable-shared-on.mingw.patch
@@ -47,14 +48,16 @@ prepare() {
 }

 build() {
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
+
  if [ ${MINGW_CHOST} = "i686-w64-mingw32" ]; then
    _targetarch="x86-win32-gcc"
    EXTRA_CFLAGS="-mstackrealign"
  else
    _targetarch="x86_64-win64-gcc"
  fi
-  mkdir -p ${srcdir}/build-${MINGW_CHOST}
-  cd "${srcdir}/build-${MINGW_CHOST}"
+
  CFLAGS="$EXTRA_CFLAGS $CFLAGS -fno-asynchronous-unwind-tables" \
  ../${_realname}-${pkgver}/configure \
    --prefix=${MINGW_PREFIX} \
@@ -83,11 +86,11 @@ build() {

 #These tests seem to take a lot of time
 #check() {
-#  cd "${srcdir}/build-$MINGW_CHOST"
+#  cd "${srcdir}/build-$MSYSTEM"
 #  make test
 #}

 package() {
-  cd "${srcdir}/build-$MINGW_CHOST"
+  cd "${srcdir}/build-${MSYSTEM}"
  make DIST_DIR="${pkgdir}${MINGW_PREFIX}" install
 }
--- a/mingw-w64-mesa/PKGBUILD
+++ b/mingw-w64-mesa/PKGBUILD
@@ -4,7 +4,7 @@ _realname=mesa
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=21.3.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Open-source implementation of the OpenGL specification (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -17,7 +17,8 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
 depends=("${MINGW_PACKAGE_PREFIX}-llvm"
         "${MINGW_PACKAGE_PREFIX}-zlib"
         "${MINGW_PACKAGE_PREFIX}-vulkan-loader"
-         "${MINGW_PACKAGE_PREFIX}-libsystre")
+         "${MINGW_PACKAGE_PREFIX}-libsystre"
+         "${MINGW_PACKAGE_PREFIX}-libwinpthread-git")
 optdepends=("${MINGW_PACKAGE_PREFIX}-opengl-man-pages: for the OpenGL API man pages"
            "${MINGW_PACKAGE_PREFIX}-zstd: use ZSTD instead of zlib for certain compression tasks"
            "${MINGW_PACKAGE_PREFIX}-vulkan-validation-layers: to debug applications using Vulkan graphics")
--- a/mingw-w64-mxml/PKGBUILD
+++ b/mingw-w64-mxml/PKGBUILD
@@ -4,13 +4,14 @@ _realname=mxml
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=3.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A tiny XML library for reading and writing XML files (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url="https://www.msweet.org/mxml/"
 license=('Apache-2.0')
-depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
+depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
+         "${MINGW_PACKAGE_PREFIX}-libwinpthread-git")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
             "${MINGW_PACKAGE_PREFIX}-autotools")
 options=('strip' 'staticlibs')
@@ -29,8 +30,8 @@ prepare() {
 }

 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}"
  cp -a "../${_realname}-${pkgver}/." .

  ./configure \
@@ -44,6 +45,6 @@ build() {
 }

 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
  make DSTROOT="${pkgdir}" install
 }
--- a/mingw-w64-pupnp/PKGBUILD
+++ b/mingw-w64-pupnp/PKGBUILD
@@ -5,12 +5,13 @@ _realname=pupnp
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.14.12
-pkgrel=2
+pkgrel=3
 pkgdesc="Portable SDK for UPnP* Devices (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url="https://github.com/pupnp/pupnp"
 license=("BSD")
+depends=("${MINGW_PACKAGE_PREFIX}-libwinpthread-git")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja")
 options=('strip' 'staticlibs')
 source=(libupnp-${pkgver}.tar.bz2::https://github.com/pupnp/pupnp/releases/download/release-${pkgver}/libupnp-${pkgver}.tar.bz2
--- a/mingw-w64-qrencode/PKGBUILD
+++ b/mingw-w64-qrencode/PKGBUILD
@@ -5,11 +5,12 @@ _realname=qrencode
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=4.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="C library for encoding data in a QR Code symbol (mingw-w64)"
 arch=(any)
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
-depends=("${MINGW_PACKAGE_PREFIX}-libpng")
+depends=("${MINGW_PACKAGE_PREFIX}-libpng"
+         "${MINGW_PACKAGE_PREFIX}-libwinpthread-git")
 makedepends=(
  "${MINGW_PACKAGE_PREFIX}-SDL"
  "${MINGW_PACKAGE_PREFIX}-autotools"
@@ -20,9 +21,8 @@ source=(https://fukuchi.org/works/${_realname}/${_realname}-${pkgver}.tar.bz2)
 sha256sums=('e455d9732f8041cf5b9c388e345a641fd15707860f928e94507b1961256a6923')

 build() {
-  rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir "${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}"

  ../${_realname}-${pkgver}/configure \
    --prefix=${MINGW_PREFIX} \
@@ -34,11 +34,11 @@ build() {
 }

 check () {
-  make check -C build-${MINGW_CHOST}
+  make check -C build-${MSYSTEM}
 }

 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
  make DESTDIR="${pkgdir}" install
  install -Dm0644 ${srcdir}/${_realname}-${pkgver}/COPYING ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING
 }
--- a/mingw-w64-seacas/PKGBUILD
+++ b/mingw-w64-seacas/PKGBUILD
@@ -5,19 +5,21 @@ _releases=2022-01-27
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=${_releases//-/.}
-pkgrel=3
+pkgrel=4
 pkgdesc="The Sandia Engineering Analysis Code Access System (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 conflicts=("${MINGW_PACKAGE_PREFIX}-libexodus")
 depends=("${MINGW_PACKAGE_PREFIX}-crt"
-	 "${MINGW_PACKAGE_PREFIX}-metis"
-	 "${MINGW_PACKAGE_PREFIX}-matio"
-	 "${MINGW_PACKAGE_PREFIX}-netcdf")
+         "${MINGW_PACKAGE_PREFIX}-metis"
+         "${MINGW_PACKAGE_PREFIX}-matio"
+         "${MINGW_PACKAGE_PREFIX}-netcdf"
+         "${MINGW_PACKAGE_PREFIX}-libwinpthread-git")
 makedepends=("unzip"
             "${MINGW_PACKAGE_PREFIX}-ninja"
             "${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-cc")
+             "${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-python")
 url="https://gsjaardema.github.io/seacas/"
 license=('BSD')
 source=("https://github.com/gsjaardema/seacas/archive/refs/tags/v${_releases}.zip"
@@ -26,7 +28,7 @@ sha256sums=('D21C14B9B30F773CEF8E2029773F3CC35DA021EEBE9060298231F95021EB814F'
            'a3561756bfdeb942fc62add0aefa542b0e689b76a7f0d2d357e299465ee344d2')
 noextract=("v${_releases}.zip") # bsdtar could not unpack this archive

-prepare() {  
+prepare() {
  rm -rf "${srcdir}/seacas-${_releases}"
  unzip -oq v${_releases}.zip -d "${srcdir}"

@@ -36,14 +38,16 @@ prepare() {

 build() {
  #Static Build
-  [[ -d "${_realname}-${_releases}/build-${MINGW_CHOST}-static" ]] && rm -rf "${_realname}-${_releases}/build-${MINGW_CHOST}-static"
-  mkdir -p "${_realname}-${_releases}/build-${MINGW_CHOST}-static" && cd "${_realname}-${_releases}/build-${MINGW_CHOST}-static"
-  
+  [[ -d "${_realname}-${_releases}/build-${MSYSTEM}-static" ]] && rm -rf "${_realname}-${_releases}/build-${MSYSTEM}-static"
+  mkdir -p "${_realname}-${_releases}/build-${MSYSTEM}-static" && cd "${_realname}-${_releases}/build-${MSYSTEM}-static"
+
  MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
      INSTALL_PATH=${MINGW_PREFIX} THREADSAFE=ON ../cmake-config \
      -GNinja \
      -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
      -DCMAKE_BUILD_TYPE=Release \
+      -DCMAKE_C_COMPILER=${MINGW_PREFIX}/bin/cc.exe \
+      -DCMAKE_CXX_COMPILER=${MINGW_PREFIX}/bin/c++.exe \
      -DSEACASProj_ENABLE_Fortran=OFF \
      -DTPL_ENABLE_X11=OFF \
      -DSEACASProj_ENABLE_TESTS=OFF \
@@ -52,14 +56,16 @@ build() {
  ${MINGW_PREFIX}/bin/cmake --build .

  #Shared Build
-  [[ -d "../build-${MINGW_CHOST}-shared" ]] && rm -rf "../build-${MINGW_CHOST}-shared"
-  mkdir -p "../build-${MINGW_CHOST}-shared" && cd "../build-${MINGW_CHOST}-shared"
-  
+  [[ -d "../build-${MSYSTEM}-shared" ]] && rm -rf "../build-${MSYSTEM}-shared"
+  mkdir -p "../build-${MSYSTEM}-shared" && cd "../build-${MSYSTEM}-shared"
+
  MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
      INSTALL_PATH=${MINGW_PREFIX} THREADSAFE=ON ../cmake-config \
      -GNinja \
      -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
      -DCMAKE_BUILD_TYPE=Release \
+      -DCMAKE_C_COMPILER=${MINGW_PREFIX}/bin/cc.exe \
+      -DCMAKE_CXX_COMPILER=${MINGW_PREFIX}/bin/c++.exe \
      -DSEACASProj_ENABLE_Fortran=OFF \
      -DTPL_ENABLE_X11=OFF \
      -DSEACASProj_ENABLE_TESTS=OFF \
@@ -70,17 +76,17 @@ build() {

 package() {
  #Static Install
-  cd "${srcdir}/${_realname}-${_releases}/build-${MINGW_CHOST}-static"
+  cd "${srcdir}/${_realname}-${_releases}/build-${MSYSTEM}-static"
  DESTDIR=${pkgdir} cmake --build . --target install
-  
+
  #Shared Install
-  cd "${srcdir}/${_realname}-${_releases}/build-${MINGW_CHOST}-shared"
+  cd "${srcdir}/${_realname}-${_releases}/build-${MSYSTEM}-shared"
  DESTDIR=${pkgdir} cmake --build . --target install
  install -Dm644 "${srcdir}/${_realname}-${_releases}"/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE
-  
+
  #remove useless file, a "fake" mpi interface that allows us to use MPI-enabled codes/libraries (e.g. zoltan) in an application that is built without MPI, conflict with msmpi:
  rm -r ${pkgdir}${MINGW_PREFIX}/include/mpi.h
  #rm -r ${pkgdir}${MINGW_PREFIX}/include/_MPI_UTILITY.h
  #rm -r ${pkgdir}${MINGW_PREFIX}/include/mpi*.h
-  #rm -r ${pkgdir}${MINGW_PREFIX}/lib/libsimpi.a 
+  #rm -r ${pkgdir}${MINGW_PREFIX}/lib/libsimpi.a
 }