From f5711fcedd0dc9ba01ed8337d38181efa2b8ab5e Mon Sep 17 00:00:00 2001
From: Mehdi Chinoune <mehdi.chinoune@hotmail.com>
Date: Tue, 2 Nov 2021 20:56:56 +0100
Subject: [PATCH] Install static library before the shared one.

For only the packages that export cmake files.
---
 mingw-w64-benchmark/PKGBUILD         | 32 ++++++++++++++----------
 mingw-w64-double-conversion/PKGBUILD | 33 +++++++++++++------------
 mingw-w64-fmt/PKGBUILD               | 37 ++++++++++++++--------------
 mingw-w64-snappy/PKGBUILD            | 22 ++++++++---------
 mingw-w64-uriparser/PKGBUILD         | 36 ++++++++++++++-------------
 5 files changed, 85 insertions(+), 75 deletions(-)

diff --git a/mingw-w64-benchmark/PKGBUILD b/mingw-w64-benchmark/PKGBUILD
index ffac7323d7..a75c29558e 100644
--- a/mingw-w64-benchmark/PKGBUILD
+++ b/mingw-w64-benchmark/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 _gtest_ver=1.11.0
 pkgver=1.5.6
-pkgrel=1
+pkgrel=2
 pkgdesc="A microbenchmark support library, by Google (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -36,8 +36,8 @@ prepare() {
 
 build() {
   # Shared Build
-  [[ -d "${srcdir}/build-${MINGW_CHOST}-shared" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}-shared"
-  mkdir -p "${srcdir}"/build-${MINGW_CHOST}-shared && cd "${srcdir}"/build-${MINGW_CHOST}-shared
+  [[ -d "${srcdir}/build-${MSYSTEM}-shared" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-shared"
+  mkdir -p "${srcdir}"/build-${MSYSTEM}-shared && cd "${srcdir}"/build-${MSYSTEM}-shared
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake.exe \
@@ -45,13 +45,16 @@ build() {
       -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
       -DCMAKE_BUILD_TYPE="Release" \
       -DBUILD_SHARED_LIBS="ON" \
+      -DPython_EXECUTABLE=${MINGW_PREFIX}/bin/python.exe \
+      -DPython_FIND_REGISTRY=NEVER \
+      -DPython_ROOT_DIR=${MINGW_PREFIX} \
       ../${_realname}-${pkgver}
 
   ${MINGW_PREFIX}/bin/cmake.exe --build ./
 
   # Static Build
-  [[ -d "${srcdir}/build-${MINGW_CHOST}-static" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}-static"
-  mkdir -p "${srcdir}"/build-${MINGW_CHOST}-static && cd "${srcdir}"/build-${MINGW_CHOST}-static
+  [[ -d "${srcdir}/build-${MSYSTEM}-static" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-static"
+  mkdir -p "${srcdir}"/build-${MSYSTEM}-static && cd "${srcdir}"/build-${MSYSTEM}-static
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake.exe \
@@ -59,6 +62,9 @@ build() {
       -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
       -DCMAKE_BUILD_TYPE="Release" \
       -DBUILD_SHARED_LIBS="OFF" \
+      -DPython_EXECUTABLE=${MINGW_PREFIX}/bin/python.exe \
+      -DPython_FIND_REGISTRY=NEVER \
+      -DPython_ROOT_DIR=${MINGW_PREFIX} \
       ../${_realname}-${pkgver}
 
   ${MINGW_PREFIX}/bin/cmake.exe --build ./
@@ -66,22 +72,22 @@ build() {
 
 check() {
   # Shared Check
-  cd "${srcdir}/build-${MINGW_CHOST}-shared"
+  cd "${srcdir}/build-${MSYSTEM}-shared"
   PATH=$PWD/src:$PATH ${MINGW_PREFIX}/bin/ctest.exe ./ || true
 
   # Static Check
-  cd "${srcdir}/build-${MINGW_CHOST}-static"
+  cd "${srcdir}/build-${MSYSTEM}-static"
   ${MINGW_PREFIX}/bin/ctest.exe ./ || true
 }
 
 package() {
-  # Shared Install
-  cd "${srcdir}/build-${MINGW_CHOST}-shared"
-  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
-
   # Static Install
-  cd "${srcdir}/build-${MINGW_CHOST}-static"
-  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
+  cd "${srcdir}/build-${MSYSTEM}-static"
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install .
+
+  # Shared Install
+  cd "${srcdir}/build-${MSYSTEM}-shared"
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install .
 
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   for pcfile in "${pkgdir}${MINGW_PREFIX}"/lib/pkgconfig/*.pc; do
diff --git a/mingw-w64-double-conversion/PKGBUILD b/mingw-w64-double-conversion/PKGBUILD
index f366945cd2..b1bbf82faa 100644
--- a/mingw-w64-double-conversion/PKGBUILD
+++ b/mingw-w64-double-conversion/PKGBUILD
@@ -4,58 +4,59 @@ _realname=double-conversion
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=3.1.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Binary-decimal and decimal-binary routines for IEEE doubles (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url="https://github.com/google/double-conversion"
 license=('BSD')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-ninja")
 options=('strip' 'staticlibs')
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/google/double-conversion/archive/v${pkgver}.tar.gz")
 sha256sums=('a63ecb93182134ba4293fd5f22d6e08ca417caafa244afaa751cbfddf6415b13')
 
 build() {
   # shared
-  [[ -d "${srcdir}"/build-${CARCH}-shared ]] && rm -rf "${srcdir}"/build-${CARCH}-shared
-  mkdir -p "${srcdir}"/build-${CARCH}-shared && cd "${srcdir}"/build-${CARCH}-shared
+  [[ -d "${srcdir}"/build-${MSYSTEM}-shared ]] && rm -rf "${srcdir}"/build-${MSYSTEM}-shared
+  mkdir -p "${srcdir}"/build-${MSYSTEM}-shared && cd "${srcdir}"/build-${MSYSTEM}-shared
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     ${MINGW_PREFIX}/bin/cmake \
-      -G'MSYS Makefiles' \
+      -G'Ninja' \
       -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
       -DCMAKE_BUILD_TYPE=Release \
       -DCMAKE_INSTALL_LIBDIR=lib \
       -DBUILD_SHARED_LIBS=ON \
       ../${_realname}-${pkgver}
 
-  make
+  cmake --build .
 
   # static
-  [[ -d "${srcdir}"/build-${CARCH}-static ]] && rm -rf "${srcdir}"/build-${CARCH}-static
-  mkdir -p "${srcdir}"/build-${CARCH}-static && cd "${srcdir}"/build-${CARCH}-static
+  [[ -d "${srcdir}"/build-${MSYSTEM}-static ]] && rm -rf "${srcdir}"/build-${MSYSTEM}-static
+  mkdir -p "${srcdir}"/build-${MSYSTEM}-static && cd "${srcdir}"/build-${MSYSTEM}-static
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     ${MINGW_PREFIX}/bin/cmake \
-      -G'MSYS Makefiles' \
+      -G'Ninja' \
       -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
       -DCMAKE_BUILD_TYPE=Release \
       -DCMAKE_INSTALL_LIBDIR=lib \
       -DBUILD_SHARED_LIBS=OFF \
       ../${_realname}-${pkgver}
 
-  make
+  cmake --build .
 }
 
 package() {
-  # shared
-  cd "${srcdir}"/build-${CARCH}-shared
-  make install DESTDIR="${pkgdir}"
-
   # static
-  cd "${srcdir}"/build-${CARCH}-static
-  make install DESTDIR="${pkgdir}"
+  cd "${srcdir}"/build-${MSYSTEM}-static
+  DESTDIR="${pkgdir}" cmake --install .
+
+  # shared
+  cd "${srcdir}"/build-${MSYSTEM}-shared
+  DESTDIR="${pkgdir}" cmake --install .
 
   # License
   install -Dm644 ${srcdir}/${_realname}-${pkgver}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE
diff --git a/mingw-w64-fmt/PKGBUILD b/mingw-w64-fmt/PKGBUILD
index ca2c770399..4ae657f205 100644
--- a/mingw-w64-fmt/PKGBUILD
+++ b/mingw-w64-fmt/PKGBUILD
@@ -6,14 +6,15 @@ _realname=fmt
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=8.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A modern formatting library for C++ (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url="https://fmt.dev"
 license=('MIT')
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
-             "${MINGW_PACKAGE_PREFIX}-cmake")
+             "${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-ninja")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
 options=('staticlibs')
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/fmtlib/${_realname}/archive/${pkgver}.tar.gz")
@@ -21,44 +22,44 @@ sha256sums=('b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01')
 
 build() {
   # Shared Build
-  [[ -d "build-${MINGW_CHOST}-shared" ]] && rm -rf "build-${MINGW_CHOST}-shared"
-  mkdir -p ${srcdir}/build-${MINGW_CHOST}-shared
-  cd ${srcdir}/build-${MINGW_CHOST}-shared
+  [[ -d "${srcdir}/build-${MSYSTEM}-shared" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-shared"
+  mkdir -p "${srcdir}/build-${MSYSTEM}-shared" && cd "${srcdir}/build-${MSYSTEM}-shared"
+
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake.exe \
-    -G"MSYS Makefiles" \
+    -G"Ninja" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_SHARED_LIBS=ON \
     -DFMT_TEST=OFF \
     ../${_realname}-${pkgver}
 
-  make -j1 # parallel jobs break build
+  cmake --build .
 
   # Static Build
-  [[ -d "build-${MINGW_CHOST}-static" ]] && rm -rf "build-${MINGW_CHOST}-static"
-  mkdir -p ${srcdir}/build-${MINGW_CHOST}-static
-  cd ${srcdir}/build-${MINGW_CHOST}-static
+  [[ -d "${srcdir}/build-${MSYSTEM}-static" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-static"
+  mkdir -p "${srcdir}/build-${MSYSTEM}-static" &&  cd "${srcdir}/build-${MSYSTEM}-static"
+
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake.exe \
-    -G"MSYS Makefiles" \
+    -G"Ninja" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_SHARED_LIBS=OFF \
     -DFMT_TEST=OFF \
     ../${_realname}-${pkgver}
 
-  make -j1 # parallel jobs break build
+  cmake --build .
 }
 
 package() {
-  # Shared Install
-  cd "${srcdir}/build-${MINGW_CHOST}-shared"
-  make DESTDIR=${pkgdir} install
-
   # Static Install
-  cd "${srcdir}/build-${MINGW_CHOST}-static"
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/build-${MSYSTEM}-static"
+  DESTDIR=${pkgdir} cmake --install .
+
+  # Shared Install
+  cd "${srcdir}/build-${MSYSTEM}-shared"
+  DESTDIR=${pkgdir} cmake --install .
 
   # Copy the source files for including
   install -m644 ${srcdir}/${_realname}-${pkgver}/src/*.cc ${pkgdir}${MINGW_PREFIX}/include/${_realname}
diff --git a/mingw-w64-snappy/PKGBUILD b/mingw-w64-snappy/PKGBUILD
index 8c963cb263..f7987ea8d2 100644
--- a/mingw-w64-snappy/PKGBUILD
+++ b/mingw-w64-snappy/PKGBUILD
@@ -5,7 +5,7 @@ _realname=snappy
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.1.9
-pkgrel=1
+pkgrel=2
 pkgdesc="A fast compressor/decompressor library (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -34,8 +34,8 @@ prepare() {
 
 build() {
   # Shared Build
-  [[ -d "${srcdir}"/build-${MINGW_CHOST}-shared ]] && rm -rf "${srcdir}"/build-${MINGW_CHOST}-shared
-  mkdir -p ${srcdir}/build-${MINGW_CHOST}-shared && cd ${srcdir}/build-${MINGW_CHOST}-shared
+  [[ -d "${srcdir}"/build-${MSYSTEM}-shared ]] && rm -rf "${srcdir}"/build-${MSYSTEM}-shared
+  mkdir -p ${srcdir}/build-${MSYSTEM}-shared && cd ${srcdir}/build-${MSYSTEM}-shared
   
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     ${MINGW_PREFIX}/bin/cmake.exe \
@@ -50,8 +50,8 @@ build() {
   ${MINGW_PREFIX}/bin/cmake.exe --build ./
 
   # Static Build
-  [[ -d "${srcdir}"/build-${MINGW_CHOST}-static ]] && rm -rf "${srcdir}"/build-${MINGW_CHOST}-static
-  mkdir -p ${srcdir}/build-${MINGW_CHOST}-static && cd ${srcdir}/build-${MINGW_CHOST}-static
+  [[ -d "${srcdir}"/build-${MSYSTEM}-static ]] && rm -rf "${srcdir}"/build-${MSYSTEM}-static
+  mkdir -p ${srcdir}/build-${MSYSTEM}-static && cd ${srcdir}/build-${MSYSTEM}-static
   
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     ${MINGW_PREFIX}/bin/cmake.exe \
@@ -67,11 +67,11 @@ build() {
 }
 
 package() {
-  # Shared Install
-  cd "${srcdir}/build-${MINGW_CHOST}-shared"
-  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
-
   # Static Install
-  cd "${srcdir}/build-${MINGW_CHOST}-static"
-  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
+  cd "${srcdir}/build-${MSYSTEM}-static"
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install .
+
+  # Shared Install
+  cd "${srcdir}/build-${MSYSTEM}-shared"
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install .
 }
diff --git a/mingw-w64-uriparser/PKGBUILD b/mingw-w64-uriparser/PKGBUILD
index ff61cd52d7..d49ee595f4 100644
--- a/mingw-w64-uriparser/PKGBUILD
+++ b/mingw-w64-uriparser/PKGBUILD
@@ -4,7 +4,7 @@ _realname=uriparser
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.9.4
-pkgrel=1
+pkgrel=2
 pkgdesc="RFC 3986 URI parsing and processing libary (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -12,6 +12,7 @@ url="https://uriparser.sourceforge.io/"
 license=('New BSD License')
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-gtest>=1.8.1")
 source=("https://downloads.sourceforge.net/project/${_realname}/Sources/${pkgver}/${_realname}-${pkgver}.tar.bz2"
         "${_realname}-0.9.2.patch")
@@ -25,12 +26,12 @@ prepare() {
 
 build() {
   # Shared
-  [[ -d "${srcdir}/build-${MINGW_CHOST}-shared" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}-shared"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}-shared" && cd "${srcdir}/build-${MINGW_CHOST}-shared"
+  [[ -d "${srcdir}/build-${MSYSTEM}-shared" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-shared"
+  mkdir -p "${srcdir}/build-${MSYSTEM}-shared" && cd "${srcdir}/build-${MSYSTEM}-shared"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     ${MINGW_PREFIX}/bin/cmake \
-      -G'MSYS Makefiles' \
+      -G'Ninja' \
       -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
       -DCMAKE_INSTALL_LIBDIR=lib \
       -DCMAKE_BUILD_TYPE=Release \
@@ -38,15 +39,15 @@ build() {
       -DURIPARSER_BUILD_DOCS=OFF \
       ../${_realname}-${pkgver}
 
-  make
+  cmake --build .
 
   # Static
-  [[ -d "${srcdir}/build-${MINGW_CHOST}-static" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}-static"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}-static" && cd "${srcdir}/build-${MINGW_CHOST}-static"
+  [[ -d "${srcdir}/build-${MSYSTEM}-static" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-static"
+  mkdir -p "${srcdir}/build-${MSYSTEM}-static" && cd "${srcdir}/build-${MSYSTEM}-static"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     ${MINGW_PREFIX}/bin/cmake \
-      -G'MSYS Makefiles' \
+      -G'Ninja' \
       -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
       -DCMAKE_INSTALL_LIBDIR=lib \
       -DCMAKE_BUILD_TYPE=Release \
@@ -54,20 +55,21 @@ build() {
       -DURIPARSER_BUILD_DOCS=OFF \
       ../${_realname}-${pkgver}
 
-  make
+  cmake --build .
 }
 
 check() {
-  cd "${srcdir}/build-${MINGW_CHOST}-shared"
-  make check || true
+  cd "${srcdir}/build-${MSYSTEM}-shared"
+  ninja check || true
 }
 
 package() {
-  # Shared
-  cd "${srcdir}/build-${MINGW_CHOST}-shared"
-  make DESTDIR="${pkgdir}" install
-
   # Static
-  cd "${srcdir}/build-${MINGW_CHOST}-static"
-  make DESTDIR="${pkgdir}" install
+  cd "${srcdir}/build-${MSYSTEM}-static"
+  DESTDIR="${pkgdir}" cmake --install .
+
+  # Shared
+  cd "${srcdir}/build-${MSYSTEM}-shared"
+  DESTDIR="${pkgdir}" cmake --install .
+
 }