kicad-library: Use /ucrt64/bin/cmake.exe in footprint

Also, add 'mingw32' and 'clang32' to mingw_arch.
stahta01 · Oct 28, 2023 · 0ba213e · 0ba213e
1 parent 1c28886
commit 0ba213e
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/mingw-w64-kicad-library/PKGBUILD b/mingw-w64-kicad-library/PKGBUILD
@@ -5,18 +5,19 @@ pkgbase=mingw-w64-${_realname}-library
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-footprints"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-symbols"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-templates"
-         "${MINGW_PACKAGE_PREFIX}-${_realname}-packages3D"
+         $([[ ${MSYSTEM} != "CLANG32" && ${MSYSTEM} != "MINGW32" ]] && echo "${MINGW_PACKAGE_PREFIX}-${_realname}-packages3D")
          "${MINGW_PACKAGE_PREFIX}-${_realname}-meta")
 pkgver=7.0.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Support libraries for KiCad (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw64' 'ucrt64' 'clang64') # 'mingw32' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'mingw32' 'clang32')
 url='https://www.kicad.org/'
 license=("spdx:GPL-3.0-or-later")
 groups=("${MINGW_PACKAGE_PREFIX}-eda")
 depends=()
 makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
+             $([[ ${MSYSTEM} == "CLANG32" || ${MSYSTEM} == "MINGW32" ]] && echo "mingw-w64-ucrt-x86_64-cmake")
              "${MINGW_PACKAGE_PREFIX}-ninja")
 options=('!strip')
 source=("https://gitlab.com/kicad/libraries/kicad-footprints/-/archive/${pkgver}/kicad-footprints-${pkgver}.tar.bz2"
@@ -61,7 +62,11 @@ package_footprints() {
 
   cd "${srcdir}/build-footprints-${MSYSTEM}"
 
-  DESTDIR="${pkgdir}" "${MINGW_PREFIX}"/bin/cmake.exe --install .
+  if [[ ${MSYSTEM} == "CLANG32" || ${MSYSTEM} == "MINGW32" ]]; then
+    DESTDIR="${pkgdir}" /ucrt64/bin/cmake.exe --install .
+  else
+    DESTDIR="${pkgdir}" "${MINGW_PREFIX}"/bin/cmake.exe --install .
+  fi
 }
 
 package_symbols() {