benchmark: update to 1.9.0

mingw-w64-benchmark/0001-fix-pkgconfig-files.patch

@@ -1,3 +1,15 @@
+--- a/cmake/benchmark.pc.in
++++ b/cmake/benchmark.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+-includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+ 
+ Name: @PROJECT_NAME@
+ Description: Google microbenchmark framework
 --- a/cmake/benchmark_main.pc.in
 +++ b/cmake/benchmark_main.pc.in
 @@ -1,4 +1,5 @@
@@ -7,15 +19,3 @@
  
  Name: @PROJECT_NAME@
  Description: Google microbenchmark framework (with main() function)
---- a/cmake/benchmark.pc.in
-+++ b/cmake/benchmark.pc.in
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--libdir=@CMAKE_INSTALL_FULL_LIBDIR@
--includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}@CMAKE_INSTALL_INCLUDEDIR@
- 
- Name: @PROJECT_NAME@
- Description: Google microbenchmark framework

mingw-w64-benchmark/PKGBUILD

@@ -3,7 +3,7 @@
 _realname=benchmark
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=1.8.5
+pkgver=1.9.0
 pkgrel=1
 pkgdesc="A microbenchmark support library, by Google (mingw-w64)"
 arch=('any')
@@ -14,77 +14,77 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-gtest")
+# checkdepends=("${MINGW_PACKAGE_PREFIX}-gtest")
 source=("https://github.com/google/benchmark/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
-        "001-fix-pkgconfig-files.patch")
+        "0001-fix-pkgconfig-files.patch")
-sha256sums=('d26789a2b46d8808a48a4556ee58ccc7c497fcd4c0af9b90197674a81e04798a'
+sha256sums=('35a77f46cc782b16fac8d3b107fbfbb37dcd645f7c28eee19f3b8e0758b48994'
-            'e88f53dc504e7e0a4eeacd474f0d5f63d5a14f5dca1fc45f817a07548ba3233f')
+            '0f761dbc24ecc0f7dc902fd14cc16fdd448fb1b4204e08adbaee056fed8db1ef')
+
+# Helper macros to help make tasks easier #
+apply_patch_with_msg() {
+  for _patch in "$@"
+  do
+    msg2 "Applying ${_patch}"
+    patch -Nbp1 -i "${srcdir}/${_patch}"
+  done
+}
+# =========================================== #
 
 prepare() {
-  cd ${_realname}-${pkgver}
+  cd "${_realname}-${pkgver}"
-  patch -p1 -i "${srcdir}"/001-fix-pkgconfig-files.patch
+
+  apply_patch_with_msg 0001-fix-pkgconfig-files.patch
 }
 
 build() {
+  declare -a extra_config
+  if check_option "debug" "n"; then
+    extra_config+=("-DCMAKE_BUILD_TYPE=Release")
+  else
+    extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
+  fi
+
   # Shared Build
-  mkdir -p "${srcdir}"/build-${MSYSTEM}-shared && cd "${srcdir}"/build-${MSYSTEM}-shared
-
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
-  ${MINGW_PREFIX}/bin/cmake \
+    cmake -B "build-${MSYSTEM}-shared" -S "${_realname}-${pkgver}" -GNinja \
-    -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
+      -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
-    -DCMAKE_BUILD_TYPE=Release \
+      -DBUILD_SHARED_LIBS=ON \
-    -DBUILD_SHARED_LIBS=ON \
+      -DBENCHMARK_ENABLE_GTEST_TESTS=OFF \
-    -DBENCHMARK_ENABLE_WERROR=OFF \
+      -DBENCHMARK_ENABLE_LTO=ON \
-    -DBENCHMARK_USE_BUNDLED_GTEST=OFF \
+      -DBENCHMARK_ENABLE_WERROR=OFF \
-    -DBENCHMARK_ENABLE_TESTING=OFF \
+      -DBENCHMARK_USE_BUNDLED_GTEST=OFF \
-    ../${_realname}-${pkgver}
+      "${extra_config[@]}"
 
-  ${MINGW_PREFIX}/bin/cmake --build .
+  cmake --build "build-${MSYSTEM}-shared"
 
   # Static Build
-  mkdir -p "${srcdir}"/build-${MSYSTEM}-static && cd "${srcdir}"/build-${MSYSTEM}-static
-
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
-  ${MINGW_PREFIX}/bin/cmake \
+    cmake -B "build-${MSYSTEM}-static" -S "${_realname}-${pkgver}" -GNinja \
-    -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
+      -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
-    -DCMAKE_BUILD_TYPE=Release \
+      -DBUILD_SHARED_LIBS=OFF \
-    -DBUILD_SHARED_LIBS=OFF \
+      -DBENCHMARK_ENABLE_GTEST_TESTS=OFF \
-    -DBENCHMARK_ENABLE_WERROR=OFF \
+      -DBENCHMARK_ENABLE_WERROR=OFF \
-    -DBENCHMARK_USE_BUNDLED_GTEST=OFF \
+      -DBENCHMARK_USE_BUNDLED_GTEST=OFF \
-    -DBENCHMARK_ENABLE_TESTING=OFF \
+      "${extra_config[@]}"
-    ../${_realname}-${pkgver}
 
-  ${MINGW_PREFIX}/bin/cmake --build .
+  cmake --build "build-${MSYSTEM}-static"
 }
 
 check() {
   # Shared Check
-  cd "${srcdir}"/build-${MSYSTEM}-shared
+  PATH=$PWD/src:$PATH cmake --build "build-${MSYSTEM}-shared" --target test || true
-  ${MINGW_PREFIX}/bin/cmake \
-    -DBENCHMARK_ENABLE_TESTING=ON \
-    ../${_realname}-${pkgver}
-  ${MINGW_PREFIX}/bin/cmake --build .
-
-  PATH=$PWD/src:$PATH ${MINGW_PREFIX}/bin/ctest.exe ./ || warning "Tests failed"
 
   # Static Check
-  cd "${srcdir}"/build-${MSYSTEM}-static
+  cmake --build "build-${MSYSTEM}-static" --target test || true
-  ${MINGW_PREFIX}/bin/cmake \
-    -DBENCHMARK_ENABLE_TESTING=ON \
-    ../${_realname}-${pkgver}
-  ${MINGW_PREFIX}/bin/cmake --build .
-
-  ${MINGW_PREFIX}/bin/ctest.exe ./ || warning "Tests failed"
 }
 
 package() {
   # Static Install
-  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install "${srcdir}"/build-${MSYSTEM}-static
+  DESTDIR="${pkgdir}" cmake --install "build-${MSYSTEM}-static"
 
   # Shared Install
-  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install "${srcdir}"/build-${MSYSTEM}-shared
+  DESTDIR="${pkgdir}" cmake --install "build-${MSYSTEM}-shared"
 
   # License
-  install -Dm644 "${srcdir}"/${_realname}-${pkgver}/LICENSE \
+  install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE" -t "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}"
-    -t "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}
 }