SHA256
1
0
forked from pool/libguestfs

reenable ruby bindings, apply patch to fix failure in 11.4 and 12.1

happens to work in sles11sp2 and 12.2 for some reason

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=44
This commit is contained in:
Olaf Hering 2012-08-31 19:39:27 +00:00 committed by Git OBS Bridge
parent 65e8c8e0d6
commit d452806999
2 changed files with 16 additions and 8 deletions

View File

@ -1,15 +1,22 @@
Index: ruby/Makefile.am [ 478s] ERROR: RPATH "/usr/src/packages/BUILD/libguestfs-1.19.36/src/.libs" on /usr/src/packages/BUILDROOT/libguestfs-1.19.36-0.x86_64/usr/lib64/ruby/site_ruby/1.8/x86_64-linux/_guestfs.so is not allowed
[ 478s] ERROR: RPATH "/usr/src/packages/BUILD/libguestfs-1.19.36/src/.libs" on /usr/src/packages/BUILDROOT/libguestfs-1.19.36-0.x86_64/usr/lib64/ruby/site_ruby/1.8/x86_64-linux/_guestfs.so is not allowed
---
ruby/Makefile.am | 4 ++++
1 file changed, 4 insertions(+)
Index: libguestfs-1.19.36/ruby/Makefile.am
=================================================================== ===================================================================
--- ruby/Makefile.am.orig --- libguestfs-1.19.36.orig/ruby/Makefile.am
+++ ruby/Makefile.am +++ libguestfs-1.19.36/ruby/Makefile.am
@@ -53,6 +53,10 @@ TESTS_ENVIRONMENT = \ @@ -53,6 +53,10 @@ TESTS_ENVIRONMENT = $(top_builddir)/run
all: $(generator_built) all: $(generator_built)
rake build $(RAKE) build
+ sed -i 's|-Wl,-R\ -Wl,\$$(libdir)||' $(top_builddir)/ruby/ext/guestfs/Makefile + sed -i 's|-Wl,-R\ -Wl,\$$(libdir)||' $(top_builddir)/ruby/ext/guestfs/Makefile
+ sed -i 's|-Wl,-R\$$(libdir)||' $(top_builddir)/ruby/ext/guestfs/Makefile + sed -i 's|-Wl,-R\$$(libdir)||' $(top_builddir)/ruby/ext/guestfs/Makefile
+ sed -i 's|-Wl,-R[^[:blank:]]*/src/.libs||' $(top_builddir)/ruby/ext/guestfs/Makefile + sed -i 's|-Wl,-R[^[:blank:]]*/src/.libs||' $(top_builddir)/ruby/ext/guestfs/Makefile
+ make -C $(top_builddir)/ruby/ext/guestfs clean all + make -C $(top_builddir)/ruby/ext/guestfs clean all
rake rdoc $(RAKE) rdoc
RUBY_SITELIB := $(shell ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")

View File

@ -20,7 +20,7 @@
%define with_ocaml 1 %define with_ocaml 1
%define with_python 1 %define with_python 1
%define with_perl 1 %define with_perl 1
%define with_ruby 0 %define with_ruby 1
%define with_fuse 1 %define with_fuse 1
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
@ -290,6 +290,7 @@ virtual machines.
%setup -q %setup -q
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch5 -p1
%patch101 -p1 %patch101 -p1
%build %build