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: NO-JIRA: Fix C flags on ruby binding
Date Thu, 28 Apr 2016 15:23:59 GMT
Repository: qpid-proton
Updated Branches:
  refs/heads/master 1f0df2a55 -> d4de312bd


NO-JIRA: Fix C flags on ruby binding

-fvisibility=hidden flag was causing an obscure failure in release builds.


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

Branch: refs/heads/master
Commit: d4de312bdfc93b0227d8bbf830642eb364c5fdb9
Parents: 1f0df2a
Author: Alan Conway <aconway@redhat.com>
Authored: Thu Apr 28 11:01:18 2016 -0400
Committer: Alan Conway <aconway@redhat.com>
Committed: Thu Apr 28 11:03:32 2016 -0400

----------------------------------------------------------------------
 proton-c/bindings/ruby/CMakeLists.txt | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d4de312b/proton-c/bindings/ruby/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/bindings/ruby/CMakeLists.txt b/proton-c/bindings/ruby/CMakeLists.txt
index 55c232a..05c2a72 100644
--- a/proton-c/bindings/ruby/CMakeLists.txt
+++ b/proton-c/bindings/ruby/CMakeLists.txt
@@ -29,10 +29,12 @@ include_directories (${RUBY_INCLUDE_PATH})
 swig_add_module(cproton-ruby ruby ruby.i)
 swig_link_libraries(cproton-ruby ${BINDING_DEPS} ${RUBY_LIBRARY})
 
-# set a compiler macro to relay the Ruby version to the extension
-STRING(REPLACE "." "" CFLAG_RUBY_VERSION "${RUBY_VERSION}")
-STRING(SUBSTRING "${CFLAG_RUBY_VERSION}" 0 2 CFLAG_RUBY_VERSION)
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DRUBY${CFLAG_RUBY_VERSION}")
+# set a compiler macro to relay the Ruby version to the extension.
+# Don't use the global CMAKE_C_FLAGS, -fvisibility=hidden causes an obscure
+# failure with release builds.
+string(REPLACE "." "" CFLAG_RUBY_VERSION "${RUBY_VERSION}")
+string(SUBSTRING "${CFLAG_RUBY_VERSION}" 0 2 CFLAG_RUBY_VERSION)
+set(CMAKE_C_FLAGS "-DRUBY${CFLAG_RUBY_VERSION}")
 
 set_target_properties(cproton-ruby
     PROPERTIES


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


Mime
View raw message