From 8cbdb6fa41b7364f59bb03295a307dd903908eef Mon Sep 17 00:00:00 2001
From: Ebrahim Byagowi <ebrahim@gnu.org>
Date: Wed, 15 Jul 2020 13:32:57 +0430
Subject: [PATCH] [meson] Don't enable benchmark under the conditions ever

As we don't want to make headache for packagers as we don't want to
enable it when --auto-features=enabled is used.
---
 .github/workflows/msys2-ci.yml | 3 +--
 meson.build                    | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/msys2-ci.yml b/.github/workflows/msys2-ci.yml
index 2ebc47047..da16ff3e9 100644
--- a/.github/workflows/msys2-ci.yml
+++ b/.github/workflows/msys2-ci.yml
@@ -49,8 +49,7 @@ jobs:
             --auto-features=enabled \
             -Ddirectwrite=enabled \
             -Dgdi=enabled \
-            -Dgraphite=enabled \
-            -Dbenchmark=disabled
+            -Dgraphite=enabled
           ninja -C build
       - name: Test
         run: |
diff --git a/meson.build b/meson.build
index d24cd2cb2..aad81f72b 100644
--- a/meson.build
+++ b/meson.build
@@ -344,10 +344,10 @@ if not get_option('tests').disabled()
 endif
 
 if not get_option('benchmark').disabled() and \
-    ((get_option('wrap_mode') != 'nodownload' and \
-      host_machine.system() != 'windows' and \
-      not meson.is_subproject() and \
-      not meson.is_cross_build()) or get_option('benchmark').enabled())
+    get_option('wrap_mode') != 'nodownload' and \
+    host_machine.system() != 'windows' and \
+    not meson.is_subproject() and \
+    not meson.is_cross_build()
   subdir('perf')
 endif