[Pkg-libvirt-commits] [libguestfs] 01/02: Added patch to relax grub dependency

[Hilko Bengen]

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

bengen pushed a commit to branch experimental
in repository libguestfs.

commit 860e5b0e12107f873b5770f3065c42762508dc39
Author: Hilko Bengen <bengen at debian.org>
Date:   Tue Mar 25 13:10:01 2014 +0100

    Added patch to relax grub dependency
---
 .../0002-golang-Fix-for-out-of-tree-builds.patch   |  4 +-
 .../0003-ocaml-Enable-parallel-builds.patch        | 50 ++++++++++++++++++++++
 debian/patches/series                              |  2 +
 3 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/debian/patches/0002-golang-Fix-for-out-of-tree-builds.patch b/debian/patches/0002-golang-Fix-for-out-of-tree-builds.patch
index 2a15936..bb9a8f1 100644
--- a/debian/patches/0002-golang-Fix-for-out-of-tree-builds.patch
+++ b/debian/patches/0002-golang-Fix-for-out-of-tree-builds.patch
@@ -8,10 +8,10 @@ Subject: golang: Fix for out-of-tree builds
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 35460e2..42c435e 100644
+index 86cf440..fe92c16 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1445,7 +1445,7 @@ AS_IF([test "x$enable_golang" != "xno"],[
+@@ -1442,7 +1442,7 @@ AS_IF([test "x$enable_golang" != "xno"],[
      AC_CHECK_PROG([GOLANG],[go],[go],[no])
      AS_IF([test "x$GOLANG" != "xno"],[
          AC_MSG_CHECKING([if $GOLANG is usable])
diff --git a/debian/patches/0003-ocaml-Enable-parallel-builds.patch b/debian/patches/0003-ocaml-Enable-parallel-builds.patch
new file mode 100644
index 0000000..eb703a8
--- /dev/null
+++ b/debian/patches/0003-ocaml-Enable-parallel-builds.patch
@@ -0,0 +1,50 @@
+From: "Richard W.M. Jones" <rjones at redhat.com>
+Date: Sun, 23 Mar 2014 16:31:10 +0000
+Subject: ocaml: Enable parallel builds.
+
+This reintroduces commit dce94f3e266ed3f1fc634a1ef6953f2db1510963.
+---
+ ocaml/Makefile.am | 20 +++++++++++++-------
+ 1 file changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
+index 7c8e515..ee5a241 100644
+--- a/ocaml/Makefile.am
++++ b/ocaml/Makefile.am
+@@ -54,15 +54,25 @@ noinst_LIBRARIES = libguestfsocaml.a
+ # 'libmlguestfs.a' and if run at the same time, they will stomp on or
+ # corrupt each others copy.  Hence we have to serialize the calls.
+ 
+-mlguestfs.cma: libguestfsocaml.a guestfs.cmo
++CLEANFILES += stamp-mlguestfs
++
++mlguestfs.cma mlguestfs.cmxa: stamp-mlguestfs
++
++guestfs_cmm = guestfs.cmo
++if HAVE_OCAMLOPT
++guestfs_cmm += guestfs.cmx
++endif
++
++stamp-mlguestfs: libguestfsocaml.a $(guestfs_cmm)
+ 	$(OCAMLMKLIB) -o mlguestfs \
+ 	  $(libguestfsocaml_a_OBJECTS) guestfs.cmo \
+ 	  -L$(top_builddir)/src/.libs -lguestfs
+-
+-mlguestfs.cmxa: libguestfsocaml.a guestfs.cmx
++if HAVE_OCAMLOPT
+ 	$(OCAMLMKLIB) -o mlguestfs \
+ 	  $(libguestfsocaml_a_OBJECTS) guestfs.cmx \
+ 	  -L$(top_builddir)/src/.libs -lguestfs
++endif
++	touch $@
+ 
+ libguestfsocaml_a_CPPFLAGS = \
+ 	-DGUESTFS_PRIVATE=1 \
+@@ -189,7 +199,3 @@ install-data-hook:
+ CLEANFILES += $(noinst_DATA)
+ 
+ endif
+-
+-# Tell version 3.79 and up of GNU make to not build goals in this
+-# directory in parallel.
+-.NOTPARALLEL:
diff --git a/debian/patches/series b/debian/patches/series
index 4574a17..f675fe9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 0001-perl-revert-failed-attempt-at-building-out-of-tree-s.patch
 0002-golang-Fix-for-out-of-tree-builds.patch
+0003-ocaml-Enable-parallel-builds.patch
+0004-Only-grub-install-is-needed.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git