mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

enable parallel ghc for building git-annex

Browse source 
Via a build flag this time, that's off by default because hackage
demands it be so, but that gets turned on by the Makefile and by stack.
This commit is contained in:
Joey Hess 2023-09-26 13:46:44 -04:00
parent 4ac2758ba5
commit c2e60dd7a6
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
5 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -35,7 +35,7 @@ install-home:
tmp/configure-stamp: Build/TestConfig.hs Build/Configure.hs tmp/configure-stamp: Build/TestConfig.hs Build/Configure.hs
if [ "$(BUILDER)" = ./Setup ]; then $(GHC) --make Setup; fi if [ "$(BUILDER)" = ./Setup ]; then $(GHC) --make Setup; fi
if [ "$(BUILDER)" != stack ]; then \ if [ "$(BUILDER)" != stack ]; then \
$(BUILDER) configure $(BUILDERCOMMONOPTIONS) --ghc-options="$(shell Build/collect-ghc-options.sh)"; \ $(BUILDER) configure -fParallelBuild $(BUILDERCOMMONOPTIONS) --ghc-options="$(shell Build/collect-ghc-options.sh)"; \
rm cabal.project.local~* 2>/dev/null || true; \ rm cabal.project.local~* 2>/dev/null || true; \
else \ else \
$(BUILDER) setup $(BUILDERCOMMONOPTIONS); \ $(BUILDER) setup $(BUILDERCOMMONOPTIONS); \
@ -53,7 +53,7 @@ dev:
# This leaves cabal.project.local configured for a prof build, # This leaves cabal.project.local configured for a prof build,
# so just running make will continue to do prof builds. # so just running make will continue to do prof builds.
prof: prof:
$(BUILDER) configure -f"-Production" \ $(BUILDER) configure -f"-Production" -fParallelBuild \
--enable-executable-dynamic --enable-profiling --enable-executable-dynamic --enable-profiling
rm cabal.project.local~* 2>/dev/null || true rm cabal.project.local~* 2>/dev/null || true
mkdir -p tmp mkdir -p tmp

7
git-annex.cabal
View file

@ -159,6 +159,10 @@ Flag Pairing
Flag Production Flag Production
Description: Enable production build (slower build; faster binary) Description: Enable production build (slower build; faster binary)
Flag ParallelBuild
Description: Enable production build (slower build; faster binary)
Default: False
Flag TorrentParser Flag TorrentParser
Description: Use haskell torrent library to parse torrent files Description: Use haskell torrent library to parse torrent files
@ -292,6 +296,9 @@ Executable git-annex
else else
GHC-Options: -O0 GHC-Options: -O0
if flag(ParallelBuild)
GHC-Options: -j
-- Avoid linking with unused dynamic libraries. -- Avoid linking with unused dynamic libraries.
if os(linux) || os(freebsd) if os(linux) || os(freebsd)
GHC-Options: -optl-Wl,--as-needed GHC-Options: -optl-Wl,--as-needed

1
stack-lts-18.13.yaml
View file

@ -1,6 +1,7 @@
flags: flags:
git-annex: git-annex:
production: true production: true
parallelbuild: true
assistant: true assistant: true
pairing: true pairing: true
torrentparser: true torrentparser: true

1
stack.yaml
View file

@ -1,6 +1,7 @@
flags: flags:
git-annex: git-annex:
production: true production: true
parallelbuild: true
assistant: true assistant: true
pairing: true pairing: true
torrentparser: true torrentparser: true

1
standalone/linux/stack-i386ancient.yaml
View file

@ -1,6 +1,7 @@
flags: flags:
git-annex: git-annex:
production: true production: true
parallelbuild: true
assistant: true assistant: true
pairing: true pairing: true
torrentparser: true torrentparser: true