[Debian-ha-commits] [ocfs2-tools] 02/07: debian/patches: enable parallel builds

[Valentin Vidic]

This is an automated email from the git hooks/post-receive script.

vvidic-guest pushed a commit to branch master
in repository ocfs2-tools.

commit ecf91a303ceba3d140aaad30f675e5ae290c56f6
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Thu Jul 6 08:24:24 2017 +0200

    debian/patches: enable parallel builds
---
 debian/patches/parallel-build.patch | 39 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 2 files changed, 40 insertions(+)

diff --git a/debian/patches/parallel-build.patch b/debian/patches/parallel-build.patch
new file mode 100644
index 0000000..105d23c
--- /dev/null
+++ b/debian/patches/parallel-build.patch
@@ -0,0 +1,39 @@
+Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
+Bug: https://github.com/markfasheh/ocfs2-tools/pull/14
+Last-Update: 2017-06-29
+Subject: Makefile: allow parallel builds
+
+    Split SUBDIRS into groups that can be built in parallel,
+    so that something like 'make -j8' now works correctly.
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/Makefile b/Makefile
+index 9519a4e2..955fab9c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -20,13 +20,22 @@ CHKCONFIG_DEP = chkconfig
+ COMPILE_PY = 1
+ endif
+ 
+-SUBDIRS = include libtools-internal libo2dlm libo2cb libocfs2 fsck.ocfs2 mkfs.ocfs2 mounted.ocfs2 tunefs.ocfs2 debugfs.ocfs2 o2cb_ctl ocfs2_hb_ctl mount.ocfs2 ocfs2_controld o2image o2info o2monitor extras fswreck patches
++SUBDIRS1 = include
++SUBDIRS2 = libtools-internal libo2dlm libo2cb
++SUBDIRS3 = libocfs2
++SUBDIRS4 = fsck.ocfs2 mkfs.ocfs2 mounted.ocfs2 tunefs.ocfs2 debugfs.ocfs2 o2cb_ctl ocfs2_hb_ctl mount.ocfs2 ocfs2_controld o2image o2info o2monitor extras fswreck patches
+ 
+ ifdef BUILD_OCFS2CONSOLE
+-SUBDIRS += ocfs2console
++SUBDIRS4 += ocfs2console
+ endif
+ 
+-SUBDIRS += vendor
++SUBDIRS4 += vendor
++
++$(SUBDIRS2): $(SUBDIRS1)
++$(SUBDIRS3): $(SUBDIRS2)
++$(SUBDIRS4): $(SUBDIRS3)
++
++SUBDIRS = $(SUBDIRS1) $(SUBDIRS2) $(SUBDIRS3) $(SUBDIRS4)
+ 
+ PKGCONFIG_SOURCES =	\
+ 	o2cb.pc.in	\
diff --git a/debian/patches/series b/debian/patches/series
index 78cd504..54f73aa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ ocfs2-init-script.patch
 o2cb-init-script.patch
 dead_threshold.patch
 systemd-service.patch
+parallel-build.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/ocfs2-tools.git