From: Nadav Har'El <n...@scylladb.com>
Committer: Nadav Har'El <n...@scylladb.com>
Branch: master

ruby: do version_check at the start

Building the ruby module requires (I have no idea why) the exact same
version of Ruby to be installed on your host. There is a version check
in the Makefile, but it was wrongly started *in parallel* with the main
build, so usually one saw some lengthy build followed by a mysterious
failure without any visible reason.
After this patch, one sees the error immediately:

Please install ruby 2.2.4.
make: *** [Makefile:18: version_check] Error 1

Signed-off-by: Nadav Har'El <n...@scylladb.com>

---
diff --git a/ruby/Makefile b/ruby/Makefile
--- a/ruby/Makefile
+++ b/ruby/Makefile
@@ -1,5 +1,5 @@
 .PHONY: module version_check test clean
-module: version_check ruby.so usr.manifest
+module: usr.manifest

 CFLAGS=-fPIC -Wall -shared

@@ -17,7 +17,7 @@ LIBOBSTACK_A=upstream/obstack-1.2/.libs/libobstack.a
 version_check:
@test 1 -eq `ruby --version|grep -e "^ruby ${RUBY_VER}"|wc -l` || (echo "Please install ruby ${RUBY_VER}." && exit 1)

-upstream/ruby:
+upstream/ruby: version_check
        mkdir -p upstream
cd upstream && git clone --depth 1 -b v$(subst .,_,${RUBY_VER}) https://github.com/ruby/ruby.git cd upstream/ruby && patch -p1 < ../../no-use-sleepy-thread-timer-ruby.patch

--
You received this message because you are subscribed to the Google Groups "OSv 
Development" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to osv-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to