Build with -j1 again to get reproducible build.

This was in the cabal file earlier, and was removed because it broke the
android cross build. Moving to the git-annex target of the Makefile
will make it be used for Debian packages etc but not android cross builds
or make fast or when users build with cabal.

diff --git a/Makefile b/Makefile
index 523632edc67860be44c6d1b47f7fa37a7f094e22..63344bd502b503a502557c3edb880c8bdd9ad225 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,9 @@ Build/SysConfig.hs: configure.hs Build/TestConfig.hs Build/Configure.hs
        if [ "$(CABAL)" = ./Setup ]; then ghc --make Setup; fi
        $(CABAL) configure --ghc-options="$(shell Build/collect-ghc-options.sh)"
 
+# -j1 is used for reproducible build
 git-annex: Build/SysConfig.hs
-       $(CABAL) build
+       $(CABAL) build -j1
        ln -sf dist/build/git-annex/git-annex git-annex
 
 man/%.1: doc/%.mdwn
@@ -242,8 +243,7 @@ androidapp:
        $(MAKE) -C standalone/android
 
 # We bypass cabal, and only run the main ghc --make command for a
-# fast development built. Note: Does not rebuild C libraries, or link
-# executable.
+# fast development built.
 fast: dist/caballog
        @$$(grep 'ghc --make' dist/caballog | head -n 1 | sed -e 's/-package-id [^ ]*//g' -e 's/-hide-all-packages//') -O0 -j -dynamic
        @ln -sf dist/build/git-annex/git-annex git-annex

diff --git a/debian/changelog b/debian/changelog
index 451d1b473b547c83a9d08e15af83f3ec5bbe147a..79598575dcdc69858785b43df5d06c0233f428d9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-annex (5.20151117) UNRELEASED; urgency=medium
+
+  * Build with -j1 again to get reproducible build.
+
+ -- Joey Hess <id@joeyh.name>  Mon, 16 Nov 2015 16:49:34 -0400
+
 git-annex (5.20151116) unstable; urgency=medium
 
   * Use concurrent-output library when configured with -fConcurrentOutput.