From 35457c90e0cf9cb3ff45a1a67037f3bc57b48c16 Mon Sep 17 00:00:00 2001
From: umarcor <unai.martinezcorral@ehu.eus>
Date: Tue, 19 May 2020 18:25:44 +0200
Subject: [PATCH] msys2: work around makepkg hanging at the end of build()

---
 dist/msys2-mingw/llvm/PKGBUILD  | 1 +
 dist/msys2-mingw/mcode/PKGBUILD | 2 ++
 dist/msys2-mingw/run.sh         | 6 ++++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/dist/msys2-mingw/llvm/PKGBUILD b/dist/msys2-mingw/llvm/PKGBUILD
index a947aa1e371..3fa78522d3e 100644
--- a/dist/msys2-mingw/llvm/PKGBUILD
+++ b/dist/msys2-mingw/llvm/PKGBUILD
@@ -19,6 +19,7 @@ build() {
   cd "${srcdir}/builddir"
   ../../../../../configure --prefix=${MINGW_PREFIX} --with-llvm-config="llvm-config --link-static" LDFLAGS="-static" --enable-libghdl --enable-synth
   make GNATMAKE="gnatmake -j$(nproc)"
+  exit
 }
 
 package() {
diff --git a/dist/msys2-mingw/mcode/PKGBUILD b/dist/msys2-mingw/mcode/PKGBUILD
index 591fa669366..b7d76a15968 100644
--- a/dist/msys2-mingw/mcode/PKGBUILD
+++ b/dist/msys2-mingw/mcode/PKGBUILD
@@ -19,6 +19,7 @@ build() {
   cd "${srcdir}/builddir"
   ../../../../../configure --prefix=${MINGW_PREFIX} LDFLAGS=-static --enable-libghdl --enable-synth
   make GNATMAKE="gnatmake -j$(nproc)"
+  exit
 }
 
 package() {
@@ -26,3 +27,4 @@ package() {
   mkdir -p "${pkgdir}${MINGW_PREFIX}/lib"
   make DESTDIR="${pkgdir}" install
 }
+
diff --git a/dist/msys2-mingw/run.sh b/dist/msys2-mingw/run.sh
index a24578adc17..ca9fd0a38de 100644
--- a/dist/msys2-mingw/run.sh
+++ b/dist/msys2-mingw/run.sh
@@ -93,10 +93,12 @@ build () {
 
   gstart 'Build package'
     dos2unix PKGBUILD
-    makepkg-mingw -sCLfc --noconfirm --noprogressbar
+    makepkg-mingw --noconfirm --noprogressbar -sCLf --noarchive
   gend
 
-  ls -la
+  gstart 'Archive package'
+    makepkg-mingw --noconfirm --noprogressbar -R
+  gend
 
   gstart 'Install package'
     pacman --noconfirm -U "mingw-w64-${TARBALL_ARCH}-ghdl-${TARGET}-ci"-*-any.pkg.tar.zst