[Pkg-libvirt-commits] [libguestfs] 14/37: patch queue upate (java, haskell)
Hilko Bengen
bengen at moszumanska.debian.org
Sun Dec 22 18:13:37 UTC 2013
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to annotated tag debian/1%1.15.10-1
in repository libguestfs.
commit 375a1fae474491a8d3b77dc41820c07c5f6eeaf6
Author: Hilko Bengen <bengen at debian.org>
Date: Tue Nov 15 00:13:09 2011 +0100
patch queue upate (java, haskell)
---
debian/.gitignore | 1 -
...ebootstrap-etc.-even-if-not-building-appl.patch | 23 ++++++-
debian/patches/0012-Java-build-fixes.patch | 23 +++++--
.../patches/0013-out-of-tree-build-haskell.patch | 43 ++++++++++++
...0013-autoreconf.patch => 0014-autoreconf.patch} | 76 ++++++++++++++++++++--
debian/patches/series | 3 +-
6 files changed, 153 insertions(+), 16 deletions(-)
diff --git a/debian/.gitignore b/debian/.gitignore
index 0e166e4..0fdf99f 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -13,7 +13,6 @@
/libguestfs-doc
/libguestfs-perl
/erlang-guestfs
-/libghc-guestfs-dev
/libguestfs-java
/libguestfs-tools
/libguestfs0-dbg
diff --git a/debian/patches/0005-check-for-febootstrap-etc.-even-if-not-building-appl.patch b/debian/patches/0005-check-for-febootstrap-etc.-even-if-not-building-appl.patch
index 92e4a76..b1461d7 100644
--- a/debian/patches/0005-check-for-febootstrap-etc.-even-if-not-building-appl.patch
+++ b/debian/patches/0005-check-for-febootstrap-etc.-even-if-not-building-appl.patch
@@ -3,11 +3,12 @@ Date: Fri, 29 Jul 2011 17:26:07 +0200
Subject: check for febootstrap etc. even if not building appliance
---
- configure.ac | 63 +++++++++++++++++++++++++++++----------------------------
- 1 files changed, 32 insertions(+), 31 deletions(-)
+ configure.ac | 63 ++++++++++++++++++++++++++-------------------------
+ haskell/Makefile.am | 5 +++-
+ 2 files changed, 36 insertions(+), 32 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 8a8bd51..897ab32 100644
+index 4e999f6..78c4706 100644
--- a/configure.ac
+++ b/configure.ac
@@ -264,46 +264,47 @@ AC_ARG_ENABLE([appliance],
@@ -89,4 +90,20 @@ index 8a8bd51..897ab32 100644
dnl Check for rpcgen and XDR library. rpcgen is optional.
AC_CHECK_PROG([RPCGEN],[rpcgen],[rpcgen],[no])
+diff --git a/haskell/Makefile.am b/haskell/Makefile.am
+index 1fa8c0b..2cc88fd 100644
+--- a/haskell/Makefile.am
++++ b/haskell/Makefile.am
+@@ -33,7 +33,10 @@ TESTS_ENVIRONMENT = \
+ TMPDIR=$(top_builddir) \
+ $(VG)
+
+-TESTS = run-bindtests Guestfs005Load Guestfs010Basic
++TESTS = run-bindtests
++if ENABLE_APPLIANCE
++TESTS += Guestfs005Load Guestfs010Basic
++endif ENABLE_APPLIANCE
+
+ check_DATA = Bindtests
+
--
diff --git a/debian/patches/0012-Java-build-fixes.patch b/debian/patches/0012-Java-build-fixes.patch
index dee5387..474a2b1 100644
--- a/debian/patches/0012-Java-build-fixes.patch
+++ b/debian/patches/0012-Java-build-fixes.patch
@@ -4,15 +4,28 @@ Subject: Java build fixes
- enable out-of-tree build
- disable building of static version of libguestfs_jni
+- install to /usr/lib/jni
---
- java/Makefile.am | 7 ++++---
- 1 files changed, 4 insertions(+), 3 deletions(-)
+ java/Makefile.am | 10 ++++++----
+ 1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/java/Makefile.am b/java/Makefile.am
-index 31b793f..ef78773 100644
+index 31b793f..b318a95 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
-@@ -73,7 +73,7 @@ libguestfs_jni_la_SOURCES = \
+@@ -17,9 +17,10 @@
+
+ include $(top_srcdir)/subdir-rules.mk
+
++libdir = ${prefix}/lib/jni
++
+ # Old RHEL 5 autoconf doesn't have builddir.
+ builddir ?= $(top_builddir)/java
+-
+ # XXX: Need to fix generator.ml dependencies
+ #
+ # Files generated by generator.ml:
+@@ -73,7 +74,7 @@ libguestfs_jni_la_SOURCES = \
com_redhat_et_libguestfs_GuestFS.c
libguestfs_jni_la_LIBADD = $(top_builddir)/src/libguestfs.la
@@ -21,7 +34,7 @@ index 31b793f..ef78773 100644
libguestfs_jni_la_CFLAGS = \
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
-I$(top_srcdir)/src -I$(top_builddir)/src \
-@@ -116,10 +116,11 @@ TESTS_ENVIRONMENT = \
+@@ -116,10 +117,11 @@ TESTS_ENVIRONMENT = \
noinst_DATA = Bindtests.class $(java_tests:.java=.class)
t/%.class: t/%.java
diff --git a/debian/patches/0013-out-of-tree-build-haskell.patch b/debian/patches/0013-out-of-tree-build-haskell.patch
new file mode 100644
index 0000000..425fd8d
--- /dev/null
+++ b/debian/patches/0013-out-of-tree-build-haskell.patch
@@ -0,0 +1,43 @@
+From: Hilko Bengen <bengen at debian.org>
+Date: Mon, 14 Nov 2011 00:32:44 +0100
+Subject: out of tree build: haskell
+
+---
+ haskell/Makefile.am | 12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/haskell/Makefile.am b/haskell/Makefile.am
+index 2cc88fd..4a95cc4 100644
+--- a/haskell/Makefile.am
++++ b/haskell/Makefile.am
+@@ -40,23 +40,23 @@ endif ENABLE_APPLIANCE
+
+ check_DATA = Bindtests
+
+-GHCFLAGS = -I$(top_builddir)/src -L$(top_builddir)/src/.libs
++GHCFLAGS = -I$(top_builddir)/src -L$(top_builddir)/src/.libs -i$(srcdir)
+
+ all_targets = Bindtests Guestfs005Load Guestfs010Basic
+ $(all_targets): $(top_builddir)/src/libguestfs.la
+
+ all: $(all_targets)
+
+-Guestfs.o: Guestfs.hs
+- $(GHC) $(GHCFLAGS) -c $<
++Guestfs.o: $(srcdir)/Guestfs.hs
++ $(GHC) $(GHCFLAGS) -c $< -o $@
+
+-Bindtests: Bindtests.hs Guestfs.o
++Bindtests: $(srcdir)/Bindtests.hs Guestfs.o
+ $(GHC) $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs
+
+-Guestfs005Load: Guestfs005Load.hs Guestfs.o
++Guestfs005Load: $(srcdir)/Guestfs005Load.hs Guestfs.o
+ $(GHC) $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs
+
+-Guestfs010Basic: Guestfs010Basic.hs Guestfs.o
++Guestfs010Basic: $(srcdir)/Guestfs010Basic.hs Guestfs.o
+ $(GHC) $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs
+
+ CLEANFILES = $(all_targets) *~ *.hi *.o
+--
diff --git a/debian/patches/0013-autoreconf.patch b/debian/patches/0014-autoreconf.patch
similarity index 92%
rename from debian/patches/0013-autoreconf.patch
rename to debian/patches/0014-autoreconf.patch
index 37d3683..a853b75 100644
--- a/debian/patches/0013-autoreconf.patch
+++ b/debian/patches/0014-autoreconf.patch
@@ -13,15 +13,16 @@ Subject: autoreconf
edit/Makefile.in | 2 +-
erlang/Makefile.in | 2 +-
fuse/Makefile.in | 2 +-
+ haskell/Makefile.in | 15 ++++----
images/Makefile.in | 2 +-
- java/Makefile.in | 10 +++--
+ java/Makefile.in | 13 ++++---
ocaml/Makefile.in | 19 +++++-----
perl/Makefile.in | 8 +++-
python/Makefile.in | 3 +-
resize/Makefile.in | 7 ++--
sparsify/Makefile.in | 8 ++--
tools/Makefile.in | 6 ++--
- 18 files changed, 123 insertions(+), 105 deletions(-)
+ 19 files changed, 132 insertions(+), 114 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index b554b95..5080d5a 100644
@@ -579,6 +580,52 @@ index 08a38a8..ab092bf 100644
@HAVE_FUSE_TRUE at TESTS_ENVIRONMENT = \
@HAVE_FUSE_TRUE@ top_builddir=..
+diff --git a/haskell/Makefile.in b/haskell/Makefile.in
+index 8e9f043..d35945a 100644
+--- a/haskell/Makefile.in
++++ b/haskell/Makefile.in
+@@ -68,6 +68,7 @@ build_triplet = @build@
+ host_triplet = @host@
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/subdir-rules.mk
++ at ENABLE_APPLIANCE_TRUE@@HAVE_HASKELL_TRUE at am__append_1 = Guestfs005Load Guestfs010Basic
+ subdir = haskell
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
+@@ -1205,9 +1206,9 @@ EXTRA_DIST = $(generator_built) *.hs run-bindtests
+ @HAVE_HASKELL_TRUE@ TMPDIR=$(top_builddir) \
+ @HAVE_HASKELL_TRUE@ $(VG)
+
+- at HAVE_HASKELL_TRUE@TESTS = run-bindtests Guestfs005Load Guestfs010Basic
++ at HAVE_HASKELL_TRUE@TESTS = run-bindtests $(am__append_1)
+ @HAVE_HASKELL_TRUE at check_DATA = Bindtests
+- at HAVE_HASKELL_TRUE@GHCFLAGS = -I$(top_builddir)/src -L$(top_builddir)/src/.libs
++ at HAVE_HASKELL_TRUE@GHCFLAGS = -I$(top_builddir)/src -L$(top_builddir)/src/.libs -i$(srcdir)
+ @HAVE_HASKELL_TRUE at all_targets = Bindtests Guestfs005Load Guestfs010Basic
+ @HAVE_HASKELL_TRUE at CLEANFILES = $(all_targets) *~ *.hi *.o
+ all: all-am
+@@ -1516,16 +1517,16 @@ appliance: force
+
+ @HAVE_HASKELL_TRUE at all: $(all_targets)
+
+- at HAVE_HASKELL_TRUE@Guestfs.o: Guestfs.hs
+- at HAVE_HASKELL_TRUE@ $(GHC) $(GHCFLAGS) -c $<
++ at HAVE_HASKELL_TRUE@Guestfs.o: $(srcdir)/Guestfs.hs
++ at HAVE_HASKELL_TRUE@ $(GHC) $(GHCFLAGS) -c $< -o $@
+
+- at HAVE_HASKELL_TRUE@Bindtests: Bindtests.hs Guestfs.o
++ at HAVE_HASKELL_TRUE@Bindtests: $(srcdir)/Bindtests.hs Guestfs.o
+ @HAVE_HASKELL_TRUE@ $(GHC) $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs
+
+- at HAVE_HASKELL_TRUE@Guestfs005Load: Guestfs005Load.hs Guestfs.o
++ at HAVE_HASKELL_TRUE@Guestfs005Load: $(srcdir)/Guestfs005Load.hs Guestfs.o
+ @HAVE_HASKELL_TRUE@ $(GHC) $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs
+
+- at HAVE_HASKELL_TRUE@Guestfs010Basic: Guestfs010Basic.hs Guestfs.o
++ at HAVE_HASKELL_TRUE@Guestfs010Basic: $(srcdir)/Guestfs010Basic.hs Guestfs.o
+ @HAVE_HASKELL_TRUE@ $(GHC) $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/images/Makefile.in b/images/Makefile.in
index f2e3f4e..4a51f55 100644
--- a/images/Makefile.in
@@ -593,7 +640,7 @@ index f2e3f4e..4a51f55 100644
test.iso test.sqsh \
100kallzeroes 100kallnewlines 100kallspaces 100krandom 10klines \
diff --git a/java/Makefile.in b/java/Makefile.in
-index b900c4b..f732d5e 100644
+index b900c4b..613aa6d 100644
--- a/java/Makefile.in
+++ b/java/Makefile.in
@@ -92,6 +92,7 @@ build_triplet = @build@
@@ -604,7 +651,24 @@ index b900c4b..f732d5e 100644
subdir = java
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
-@@ -1335,7 +1336,7 @@ CLEANFILES = doc-stamp $(builddir)/com/redhat/et/libguestfs/*.class com_redhat_e
+@@ -1258,7 +1259,7 @@ htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
++libdir = ${prefix}/lib/jni
+ libexecdir = @libexecdir@
+ lispdir = @lispdir@
+ localedir = @localedir@
+@@ -1278,7 +1279,6 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-
+ # XXX: Need to fix generator.ml dependencies
+ #
+ # Files generated by generator.ml:
+@@ -1335,7 +1335,7 @@ CLEANFILES = doc-stamp $(builddir)/com/redhat/et/libguestfs/*.class com_redhat_e
@HAVE_JAVA_TRUE@ com_redhat_et_libguestfs_GuestFS.c
@HAVE_JAVA_TRUE at libguestfs_jni_la_LIBADD = $(top_builddir)/src/libguestfs.la
@@ -613,7 +677,7 @@ index b900c4b..f732d5e 100644
@HAVE_JAVA_TRUE at libguestfs_jni_la_CFLAGS = \
@HAVE_JAVA_TRUE@ $(WARN_CFLAGS) $(WERROR_CFLAGS) \
@HAVE_JAVA_TRUE@ -I$(top_srcdir)/src -I$(top_builddir)/src \
-@@ -1347,7 +1348,7 @@ CLEANFILES = doc-stamp $(builddir)/com/redhat/et/libguestfs/*.class com_redhat_e
+@@ -1347,7 +1347,7 @@ CLEANFILES = doc-stamp $(builddir)/com/redhat/et/libguestfs/*.class com_redhat_e
@HAVE_JAVA_TRUE at noinst_SCRIPTS = doc-stamp
# Tests (not comprehensive).
@@ -622,7 +686,7 @@ index b900c4b..f732d5e 100644
@HAVE_JAVA_TRUE at TESTS_ENVIRONMENT = \
@HAVE_JAVA_TRUE@ JAVA=$(JAVA) \
@HAVE_JAVA_TRUE@ CLASSPATH=.:t:libguestfs-$(VERSION).jar \
-@@ -1840,10 +1841,11 @@ builddir ?= $(top_builddir)/java
+@@ -1840,10 +1840,11 @@ builddir ?= $(top_builddir)/java
@HAVE_JAVA_TRUE@ cp -a api/* $(DESTDIR)$(datadir)/javadoc/$(PACKAGE_NAME)-java-$(PACKAGE_VERSION)
@HAVE_JAVA_TRUE at t/%.class: t/%.java
diff --git a/debian/patches/series b/debian/patches/series
index 06709f4..eee86eb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,4 +10,5 @@
0010-Fix-en-dis-able-install-daemon.patch
0011-Fix-include.patch
0012-Java-build-fixes.patch
-0013-autoreconf.patch
+0013-out-of-tree-build-haskell.patch
+0014-autoreconf.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git
More information about the Pkg-libvirt-commits
mailing list