qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject qpid-proton git commit: QPID-8107: [ruby] cproton.i not building on RHEL 6
Date Wed, 21 Feb 2018 19:37:13 GMT
Repository: qpid-proton
Updated Branches:
  refs/heads/master 40748d240 -> 431a86a80


QPID-8107: [ruby] cproton.i not building on RHEL 6

Fix incorrect version check introduced in
    9a8f9f59 PROTON-1738: [ruby] Fix compile warnings in SWIG source


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/431a86a8
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/431a86a8
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/431a86a8

Branch: refs/heads/master
Commit: 431a86a80a4c5a833fbfb853573fd0902cfe589d
Parents: 40748d2
Author: Alan Conway <aconway@redhat.com>
Authored: Wed Feb 21 14:34:32 2018 -0500
Committer: Alan Conway <aconway@redhat.com>
Committed: Wed Feb 21 14:36:57 2018 -0500

----------------------------------------------------------------------
 proton-c/bindings/ruby/CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/431a86a8/proton-c/bindings/ruby/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/bindings/ruby/CMakeLists.txt b/proton-c/bindings/ruby/CMakeLists.txt
index 31e0e81..d0747cb 100644
--- a/proton-c/bindings/ruby/CMakeLists.txt
+++ b/proton-c/bindings/ruby/CMakeLists.txt
@@ -32,7 +32,9 @@ swig_add_library(cproton-ruby LANGUAGE ruby SOURCES cproton.i)
 swig_link_libraries(cproton-ruby ${BINDING_DEPS} ${RUBY_LIBRARY})
 
 # Set version-dependent compile flags
-if (RUBY_VERSION VERSION_LESS 2.0.0)
+if (RUBY_VERSION VERSION_LESS 1.9.0)
+   # Don't have blocking control API
+elseif(RUBY_VERSION VERSION_LESS 2.0.0)
   set(RUBY_C_FLAGS "-DRUBY_USE_rb_thread_blocking_region")
 else()
   set(RUBY_C_FLAGS "-DRUBY_USE_rb_thread_call_without_gvl")


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message