slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

imp:cli,ui,web: always build with -threaded [#2495]

Browse Source 
It's required for runPager and presumably for the web server among
other things. The old "threaded" build flag has been dropped.
This commit is contained in:
Simon Michael 2025-11-17 14:56:01 -10:00
parent 098e65352c
commit 4920d76a3a
6 changed files with 11 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hledger-ui/hledger-ui.cabal
View File

@ -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

9
hledger-ui/package.yaml
View File

@ -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

17
hledger-web/hledger-web.cabal
View File

@ -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)

8
hledger-web/package.yaml
View File

@ -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

9
hledger/hledger.cabal
View File

@ -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

11
hledger/package.yaml
View File

@ -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