[Pkg-libvirt-commits] [libguestfs] 20/37: Updated patch queue (Ruby fixes)
Hilko Bengen
bengen at moszumanska.debian.org
Sun Dec 22 18:13:39 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 b1b14a4be8188050705476f6a4eb05ecc5de6682
Author: Hilko Bengen <bengen at debian.org>
Date: Fri Nov 18 00:43:05 2011 +0100
Updated patch queue (Ruby fixes)
---
debian/patches/0012-out-of-tree-build-ruby.patch | 99 ++++++++++++++++++++++
.../patches/0013-ruby-install-to-vendor_ruby.patch | 33 ++++++++
...0012-autoreconf.patch => 0014-autoreconf.patch} | 33 +++++++-
debian/patches/series | 4 +-
4 files changed, 167 insertions(+), 2 deletions(-)
diff --git a/debian/patches/0012-out-of-tree-build-ruby.patch b/debian/patches/0012-out-of-tree-build-ruby.patch
new file mode 100644
index 0000000..b5c1d89
--- /dev/null
+++ b/debian/patches/0012-out-of-tree-build-ruby.patch
@@ -0,0 +1,99 @@
+From: Hilko Bengen <bengen at debian.org>
+Date: Thu, 17 Nov 2011 21:40:34 +0100
+Subject: out-of-tree build: ruby
+
+---
+ ruby/Makefile.am | 4 ++--
+ ruby/Rakefile.in | 18 +++++++++---------
+ ruby/run-bindtests | 2 +-
+ 3 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/ruby/Makefile.am b/ruby/Makefile.am
+index 88d3323..757855a 100644
+--- a/ruby/Makefile.am
++++ b/ruby/Makefile.am
+@@ -61,7 +61,7 @@ RUBY_SITEARCH := $(shell ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']"
+ install:
+ $(MKDIR_P) $(DESTDIR)$(RUBY_SITELIB)
+ $(MKDIR_P) $(DESTDIR)$(RUBY_SITEARCH)
+- $(INSTALL) -p -m 0644 lib/guestfs.rb $(DESTDIR)$(RUBY_SITELIB)
+- $(INSTALL) -p -m 0755 ext/guestfs/_guestfs.so $(DESTDIR)$(RUBY_SITEARCH)
++ $(INSTALL) -p -m 0644 $(srcdir)/lib/guestfs.rb $(DESTDIR)$(RUBY_SITELIB)
++ $(INSTALL) -p -m 0755 $(builddir)/ext/guestfs/_guestfs.so $(DESTDIR)$(RUBY_SITEARCH)
+
+ endif
+diff --git a/ruby/Rakefile.in b/ruby/Rakefile.in
+index 7c5a63a..f4bf901 100644
+--- a/ruby/Rakefile.in
++++ b/ruby/Rakefile.in
+@@ -24,7 +24,7 @@ require 'rake/gempackagetask'
+ PKG_NAME='@PACKAGE_NAME@'
+ PKG_VERSION='@PACKAGE_VERSION@'
+
+-EXT_CONF='@srcdir@/ext/guestfs/extconf.rb'
++EXT_CONF='@abs_srcdir@/ext/guestfs/extconf.rb'
+ MAKEFILE='@builddir@/ext/guestfs/Makefile'
+ GUESTFS_MODULE='@builddir@/ext/guestfs/_guestfs.so'
+ GUESTFS_SRC='@srcdir@/ext/guestfs/_guestfs.c'
+@@ -38,13 +38,13 @@ CLOBBER.include [ "@builddir@/config.save", "@builddir@/ext/**/mkmf.log",
+ # Build locally
+
+ file MAKEFILE => EXT_CONF do |t|
+- unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; cd #{File::dirname(EXT_CONF)}; ruby #{File::basename(EXT_CONF)} --with-_guestfs-include=$top_srcdir/src --with-_guestfs-lib=$top_builddir/src/.libs"
++ unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/guestfs; cd @builddir@/ext/guestfs; ruby #{EXT_CONF} --with-_guestfs-include=$top_srcdir/src --with-_guestfs-lib=$top_builddir/src/.libs"
+ $stderr.puts "Failed to run extconf"
+ break
+ end
+ end
+ file GUESTFS_MODULE => [ MAKEFILE, GUESTFS_SRC ] do |t|
+- Dir::chdir(File::dirname(EXT_CONF)) do
++ Dir::chdir("@builddir@/ext/guestfs") do
+ unless sh "make"
+ $stderr.puts "make failed"
+ break
+@@ -61,19 +61,19 @@ end
+ task :test => :build
+
+ RDOC_FILES = FileList[
+- "README.rdoc",
+- "lib/**/*.rb",
+- "ext/**/*.[ch]"
++ "@srcdir@/README.rdoc",
++ "@srcdir@/lib/**/*.rb",
++ "@srcdir@/ext/**/*.[ch]"
+ ]
+
+ Rake::RDocTask.new do |rd|
+- rd.main = "README.rdoc"
++ rd.main = "@srcdir@/README.rdoc"
+ rd.rdoc_dir = "doc/site/api"
+ rd.rdoc_files.include(RDOC_FILES)
+ end
+
+ Rake::RDocTask.new(:ri) do |rd|
+- rd.main = "README.rdoc"
++ rd.main = "@srcdir@/README.rdoc"
+ rd.rdoc_dir = "doc/ri"
+ rd.options << "--ri-system"
+ rd.rdoc_files.include(RDOC_FILES)
+@@ -82,7 +82,7 @@ end
+ # Package tasks
+
+ PKG_FILES = FileList[
+- "Rakefile", "COPYING", "README", "NEWS", "README.rdoc",
++ "Rakefile", "COPYING", "README", "NEWS", "@srcdir@/README.rdoc",
+ "lib/**/*.rb",
+ "ext/**/*.[ch]", "ext/**/MANIFEST", "ext/**/extconf.rb",
+ "tests/**/*",
+diff --git a/ruby/run-bindtests b/ruby/run-bindtests
+index a78b5f6..4cac863 100755
+--- a/ruby/run-bindtests
++++ b/ruby/run-bindtests
+@@ -18,5 +18,5 @@
+
+ set -e
+
+-ruby -Ilib -Iext/guestfs bindtests.rb > bindtests.tmp
++ruby -I${srcdir}/lib -Iext/guestfs ${srcdir}/bindtests.rb > bindtests.tmp
+ diff -u ${srcdir}/../bindtests bindtests.tmp
+--
diff --git a/debian/patches/0013-ruby-install-to-vendor_ruby.patch b/debian/patches/0013-ruby-install-to-vendor_ruby.patch
new file mode 100644
index 0000000..61fbf52
--- /dev/null
+++ b/debian/patches/0013-ruby-install-to-vendor_ruby.patch
@@ -0,0 +1,33 @@
+From: Hilko Bengen <bengen at debian.org>
+Date: Thu, 17 Nov 2011 23:56:15 +0100
+Subject: ruby: install to vendor_ruby.
+
+---
+ ruby/Makefile.am | 12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/ruby/Makefile.am b/ruby/Makefile.am
+index 757855a..c68cd4a 100644
+--- a/ruby/Makefile.am
++++ b/ruby/Makefile.am
+@@ -55,13 +55,13 @@ all: $(generator_built)
+ rake build
+ rake rdoc
+
+-RUBY_SITELIB := $(shell ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
+-RUBY_SITEARCH := $(shell ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
++RUBY_VENDORLIB := $(shell ruby -rrbconfig -e "puts Config::CONFIG['vendorlibdir']")
++RUBY_VENDORARCH := $(shell ruby -rrbconfig -e "puts Config::CONFIG['vendorarchdir']")
+
+ install:
+- $(MKDIR_P) $(DESTDIR)$(RUBY_SITELIB)
+- $(MKDIR_P) $(DESTDIR)$(RUBY_SITEARCH)
+- $(INSTALL) -p -m 0644 $(srcdir)/lib/guestfs.rb $(DESTDIR)$(RUBY_SITELIB)
+- $(INSTALL) -p -m 0755 $(builddir)/ext/guestfs/_guestfs.so $(DESTDIR)$(RUBY_SITEARCH)
++ $(MKDIR_P) $(DESTDIR)$(RUBY_VENDORLIB)
++ $(MKDIR_P) $(DESTDIR)$(RUBY_VENDORARCH)
++ $(INSTALL) -p -m 0644 $(srcdir)/lib/guestfs.rb $(DESTDIR)$(RUBY_VENDORLIB)
++ $(INSTALL) -p -m 0755 $(builddir)/ext/guestfs/_guestfs.so $(DESTDIR)$(RUBY_VENDORARCH)
+
+ endif
+--
diff --git a/debian/patches/0012-autoreconf.patch b/debian/patches/0014-autoreconf.patch
similarity index 95%
rename from debian/patches/0012-autoreconf.patch
rename to debian/patches/0014-autoreconf.patch
index 356dfa7..4bbb1a8 100644
--- a/debian/patches/0012-autoreconf.patch
+++ b/debian/patches/0014-autoreconf.patch
@@ -19,9 +19,10 @@ Subject: autoreconf
perl/Makefile.in | 8 +++-
python/Makefile.in | 3 +-
resize/Makefile.in | 7 ++--
+ ruby/Makefile.in | 12 +++---
sparsify/Makefile.in | 8 ++--
tools/Makefile.in | 6 ++--
- 18 files changed, 121 insertions(+), 103 deletions(-)
+ 19 files changed, 127 insertions(+), 109 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index b554b95..5080d5a 100644
@@ -772,6 +773,36 @@ index 26312a9..b562fa1 100644
all: all-am
.SUFFIXES:
+diff --git a/ruby/Makefile.in b/ruby/Makefile.in
+index 33da059..fb86602 100644
+--- a/ruby/Makefile.in
++++ b/ruby/Makefile.in
+@@ -1222,8 +1222,8 @@ CLEANFILES = \
+ @HAVE_RUBY_TRUE@ LIBGUESTFS_PATH=$(top_builddir)/appliance \
+ @HAVE_RUBY_TRUE@ TMPDIR=$(top_builddir)
+
+- at HAVE_RUBY_TRUE@RUBY_SITELIB := $(shell ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
+- at HAVE_RUBY_TRUE@RUBY_SITEARCH := $(shell ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
++ at HAVE_RUBY_TRUE@RUBY_VENDORLIB := $(shell ruby -rrbconfig -e "puts Config::CONFIG['vendorlibdir']")
++ at HAVE_RUBY_TRUE@RUBY_VENDORARCH := $(shell ruby -rrbconfig -e "puts Config::CONFIG['vendorarchdir']")
+ all: all-am
+
+ .SUFFIXES:
+@@ -1533,10 +1533,10 @@ appliance: force
+ @HAVE_RUBY_TRUE@ rake rdoc
+
+ @HAVE_RUBY_TRUE at install:
+- at HAVE_RUBY_TRUE@ $(MKDIR_P) $(DESTDIR)$(RUBY_SITELIB)
+- at HAVE_RUBY_TRUE@ $(MKDIR_P) $(DESTDIR)$(RUBY_SITEARCH)
+- at HAVE_RUBY_TRUE@ $(INSTALL) -p -m 0644 lib/guestfs.rb $(DESTDIR)$(RUBY_SITELIB)
+- at HAVE_RUBY_TRUE@ $(INSTALL) -p -m 0755 ext/guestfs/_guestfs.so $(DESTDIR)$(RUBY_SITEARCH)
++ at HAVE_RUBY_TRUE@ $(MKDIR_P) $(DESTDIR)$(RUBY_VENDORLIB)
++ at HAVE_RUBY_TRUE@ $(MKDIR_P) $(DESTDIR)$(RUBY_VENDORARCH)
++ at HAVE_RUBY_TRUE@ $(INSTALL) -p -m 0644 $(srcdir)/lib/guestfs.rb $(DESTDIR)$(RUBY_VENDORLIB)
++ at HAVE_RUBY_TRUE@ $(INSTALL) -p -m 0755 $(builddir)/ext/guestfs/_guestfs.so $(DESTDIR)$(RUBY_VENDORARCH)
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/sparsify/Makefile.in b/sparsify/Makefile.in
index d11e272..dea641f 100644
--- a/sparsify/Makefile.in
diff --git a/debian/patches/series b/debian/patches/series
index fa74a7a..2a18ab3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,4 +9,6 @@
0009-Fix-en-dis-able-install-daemon.patch
0010-Fix-include.patch
0011-Install-Java-bindings-to-jni-subdirectory.patch
-0012-autoreconf.patch
+0012-out-of-tree-build-ruby.patch
+0013-ruby-install-to-vendor_ruby.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