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

move -j1 setting to BUILDEROPTIONS, set in debian/rules file

Browse source 
I needed BUILDEROPTIONS to allow passing flags to stack build, but it also
lets me move the -j1 out of the normal build path, and to debian/rules
which has the goal of having a reproducible build
This commit is contained in:
Joey Hess 2016-02-05 13:56:27 -04:00
parent a02b46b3f5
commit 246d0d45d7
Failed to extract signature
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -18,14 +18,13 @@ build: $(all)
Build/SysConfig.hs: configure.hs Build/TestConfig.hs Build/Configure.hs Build/SysConfig.hs: configure.hs 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) build -j1; \ $(BUILDER) build $(BUILDEROPTIONS); \
else \ else \
$(BUILDER) configure --ghc-options="$(shell Build/collect-ghc-options.sh)"; \ $(BUILDER) configure --ghc-options="$(shell Build/collect-ghc-options.sh)"; \
fi fi
# -j1 is used for reproducible build
git-annex: Build/SysConfig.hs git-annex: Build/SysConfig.hs
$(BUILDER) build -j1 $(BUILDER) build $(BUILDEROPTIONS)
if [ "$(BUILDER)" = stack ]; then \ if [ "$(BUILDER)" = stack ]; then \
ln -sf $$(find .stack-work/ -name git-annex -type f | grep build/git-annex/git-annex | tail -n 1) git-annex; \ ln -sf $$(find .stack-work/ -name git-annex -type f | grep build/git-annex/git-annex | tail -n 1) git-annex; \
else \ else \

3
debian/rules vendored
View file

@ -2,6 +2,9 @@
export BUILDER=debian/cabal-wrapper export BUILDER=debian/cabal-wrapper
# -j1 is used for reproducible build
export BUILDEROPTIONS=-j1
STANDALONE_BUILD=$(shell grep -qe '^Package: git-annex-standalone' debian/control \ STANDALONE_BUILD=$(shell grep -qe '^Package: git-annex-standalone' debian/control \
&& echo 1 || echo 0) && echo 1 || echo 0)