diff --git a/hledger-ui/hledger-ui.cabal b/hledger-ui/hledger-ui.cabal index 0de290871..521438a94 100644 --- a/hledger-ui/hledger-ui.cabal +++ b/hledger-ui/hledger-ui.cabal @@ -43,11 +43,6 @@ flag debug manual: True default: False -flag threaded - description: Build with support for multithreaded execution - manual: True - default: True - library exposed-modules: Hledger.UI @@ -124,7 +119,7 @@ executable hledger-ui Paths_hledger_ui hs-source-dirs: app - ghc-options: -Wall -Wno-incomplete-uni-patterns -Wno-missing-signatures -Wno-orphans -Wno-type-defaults -Wno-unused-do-bind + ghc-options: -Wall -Wno-incomplete-uni-patterns -Wno-missing-signatures -Wno-orphans -Wno-type-defaults -Wno-unused-do-bind -threaded cpp-options: -DVERSION="1.50.99" build-depends: base >=4.18 && <4.22 @@ -132,5 +127,3 @@ executable hledger-ui default-language: GHC2021 if (flag(debug)) cpp-options: -DDEBUG - if flag(threaded) - ghc-options: -threaded diff --git a/hledger-ui/package.yaml b/hledger-ui/package.yaml index f6c52ac9c..566390fc5 100644 --- a/hledger-ui/package.yaml +++ b/hledger-ui/package.yaml @@ -29,10 +29,6 @@ extra-source-files: - hledger-ui.info flags: - threaded: - description: Build with support for multithreaded execution - default: true - manual: true debug: description: Build with GHC 9.10+ stack traces enabled default: false @@ -112,8 +108,7 @@ executables: hledger-ui: source-dirs: app main: hledger-ui.hs - when: - - condition: flag(threaded) - ghc-options: -threaded + # -threaded is needed for runPager, at least + ghc-options: -threaded dependencies: - hledger-ui diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal index 35876942a..ee125b3a4 100644 --- a/hledger-web/hledger-web.cabal +++ b/hledger-web/hledger-web.cabal @@ -128,11 +128,6 @@ flag library-only manual: True default: False -flag threaded - description: Build with support for multithreaded execution. - manual: True - default: True - library exposed-modules: Hledger.Web @@ -158,7 +153,7 @@ library Paths_hledger_web hs-source-dirs: ./ - ghc-options: -Wall -Wno-incomplete-uni-patterns -Wno-missing-signatures -Wno-orphans -Wno-type-defaults -Wno-unused-do-bind + ghc-options: -Wall -Wno-incomplete-uni-patterns -Wno-missing-signatures -Wno-orphans -Wno-type-defaults -Wno-unused-do-bind -threaded cpp-options: -DVERSION="1.50.99" build-depends: Decimal >=0.5.1 @@ -211,8 +206,6 @@ library , yesod-static >=1.4 && <1.7 , yesod-test default-language: GHC2021 - if flag(threaded) - ghc-options: -threaded if (flag(dev)) || (flag(library-only)) cpp-options: -DDEVELOPMENT if flag(dev) @@ -228,14 +221,12 @@ executable hledger-web Paths_hledger_web hs-source-dirs: app - ghc-options: -Wall -Wno-incomplete-uni-patterns -Wno-missing-signatures -Wno-orphans -Wno-type-defaults -Wno-unused-do-bind + ghc-options: -Wall -Wno-incomplete-uni-patterns -Wno-missing-signatures -Wno-orphans -Wno-type-defaults -Wno-unused-do-bind -threaded cpp-options: -DVERSION="1.50.99" build-depends: base >=4.18 && <4.22 , hledger-web default-language: GHC2021 - if flag(threaded) - ghc-options: -threaded if (flag(dev)) || (flag(library-only)) cpp-options: -DDEVELOPMENT if flag(dev) @@ -250,14 +241,12 @@ test-suite apptest main-is: test.hs hs-source-dirs: test - ghc-options: -Wall -Wno-incomplete-uni-patterns -Wno-missing-signatures -Wno-orphans -Wno-type-defaults -Wno-unused-do-bind + ghc-options: -Wall -Wno-incomplete-uni-patterns -Wno-missing-signatures -Wno-orphans -Wno-type-defaults -Wno-unused-do-bind -threaded cpp-options: -DVERSION="1.50.99" build-depends: base >=4.18 && <4.22 , hledger-web default-language: GHC2021 - if flag(threaded) - ghc-options: -threaded if (flag(dev)) || (flag(library-only)) cpp-options: -DDEVELOPMENT if flag(dev) diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml index 37ceb0187..69cd8e9a2 100644 --- a/hledger-web/package.yaml +++ b/hledger-web/package.yaml @@ -55,10 +55,6 @@ flags: description: Turn on development settings, like auto-reload templates. default: false manual: true - threaded: - description: Build with support for multithreaded execution. - default: true - manual: true debug: description: Build with GHC 9.10+ stack traces enabled # ' default: false @@ -82,12 +78,10 @@ ghc-options: - -Wno-orphans - -Wno-type-defaults - -Wno-unused-do-bind +- -threaded # needed for runPager & probably other things when: -- condition: flag(threaded) - ghc-options: -threaded - - condition: (flag(dev)) || (flag(library-only)) cpp-options: -DDEVELOPMENT diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index 7d433272e..b003cb15d 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -101,11 +101,6 @@ flag debug manual: True default: False -flag threaded - description: Build with support for multithreaded execution - manual: True - default: True - library exposed-modules: Hledger.Cli @@ -212,7 +207,7 @@ executable hledger Paths_hledger hs-source-dirs: app - ghc-options: -Wall -Wno-incomplete-uni-patterns -Wno-missing-signatures -Wno-orphans -Wno-type-defaults -Wno-unused-do-bind -optP-Wno-nonportable-include-path -with-rtsopts=-T + ghc-options: -Wall -Wno-incomplete-uni-patterns -Wno-missing-signatures -Wno-orphans -Wno-type-defaults -Wno-unused-do-bind -optP-Wno-nonportable-include-path -threaded -with-rtsopts=-T cpp-options: -DVERSION="1.50.99" build-depends: Decimal >=0.5.1 @@ -257,8 +252,6 @@ executable hledger default-language: GHC2021 if (flag(debug)) cpp-options: -DDEBUG - if flag(threaded) - ghc-options: -threaded test-suite unittest type: exitcode-stdio-1.0 diff --git a/hledger/package.yaml b/hledger/package.yaml index 0627018db..87231af75 100644 --- a/hledger/package.yaml +++ b/hledger/package.yaml @@ -91,10 +91,6 @@ extra-source-files: - Hledger/Cli/Commands/Test.txt flags: - threaded: - description: Build with support for multithreaded execution - default: true - manual: true debug: description: Build with GHC 9.10+ stack traces enabled default: false @@ -223,10 +219,9 @@ executables: hledger: source-dirs: app main: hledger-cli.hs - ghc-options: -with-rtsopts=-T # for stats command - when: - - condition: flag(threaded) - ghc-options: -threaded + # -threaded is needed for runPager, at least + # -T is for the stats command + ghc-options: -threaded -with-rtsopts=-T dependencies: - hledger