Enable building with git-annex benchmark by default

Only turning it off when the criterion library is not installed.

Not enabled for osx or i386ancient yet since that will need some
invesitgation to update their respective stack.yaml files.

diff --git a/CHANGELOG b/CHANGELOG
index 571bb5f44011eb095cf82e16f57549b33ccb7b1f..6b1a6cd8e0b176a21f65aff7fb7124f369f1f8a0 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -38,6 +38,8 @@ git-annex (8.20200909) UNRELEASED; urgency=medium
   * Parse youtube-dl progress output, which lets progress be displayed
     when doing concurrent downloads.
   * Fix build with Benchmark build flag.
+  * Enable building with git-annex benchmark by default, only turning it
+    off when the criterion library is not installed.
 
  -- Joey Hess <id@joeyh.name>  Mon, 14 Sep 2020 18:34:37 -0400
 

diff --git a/debian/control b/debian/control
index 06d9f9f044d3bcbb66ab094f5fbb7ae4b92c66a6..d1d3697fd32d496796ec309bdf1297f9b0b41a10 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -79,6 +79,7 @@ Build-Depends:
        libghc-socks-dev,
        libghc-vector-dev,
        libghc-filepath-bytestring-dev,
+       libghc-criterion-dev,
        lsof [linux-any],
        ikiwiki,
        libimage-magick-perl,

diff --git a/git-annex.cabal b/git-annex.cabal
index f6f92326b2fe278b90e1266120afab354e44ce47..03320a9dd88ca230e45ed8d2d8687254d2ff5ad4 100644 (file)
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -270,7 +270,7 @@ Flag MagicMime
 
 Flag Benchmark
   Description: Enable benchmarking
-  Default: False
+  Default: True
 
 Flag DebugLocks
   Description: Debug location of MVar/STM deadlocks

diff --git a/stack.yaml b/stack.yaml
index b4a866c7b508d4c9f6d8ff89bbff3434111bd529..524f3ea7f28c6c2a07c9f5165de3d3314dc38179 100644 (file)
--- a/stack.yaml
+++ b/stack.yaml
@@ -8,7 +8,7 @@ flags:
     magicmime: false
     dbus: false
     debuglocks: false
-    benchmark: false
+    benchmark: true
     networkbsd: true
     gitlfs: true
     httpclientrestricted: true