[DRE-commits] [ruby-ffi-rzmq] 02/02: load so from libzmq3 or libzmq1

Dmitry Borodaenko angdraug at alioth.debian.org
Sun Oct 6 08:17:29 UTC 2013


This is an automated email from the git hooks/post-receive script.

angdraug pushed a commit to branch patch-queue/master
in repository ruby-ffi-rzmq.

commit bb766563f31398c5e1919fd1edb0f38c19248fec
Author: Dmitry Borodaenko <angdraug at gmail.com>
Date:   Sun Sep 1 19:03:52 2013 -0700

    load so from libzmq3 or libzmq1
---
 lib/ffi-rzmq/libzmq.rb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ffi-rzmq/libzmq.rb b/lib/ffi-rzmq/libzmq.rb
index 07bf6ad..69071fe 100644
--- a/lib/ffi-rzmq/libzmq.rb
+++ b/lib/ffi-rzmq/libzmq.rb
@@ -16,7 +16,7 @@ module ZMQ
       ZMQ_LIB_PATHS =([inside_gem] + local_path + [
         '/usr/local/lib', '/opt/local/lib', '/usr/local/homebrew/lib', '/usr/lib64'
       ]).map{|path| "#{path}/libzmq.#{FFI::Platform::LIBSUFFIX}"}
-      ffi_lib(ZMQ_LIB_PATHS + %w{libzmq})
+      ffi_lib(%w{libzmq.so.3 libzmq.so.1} + ZMQ_LIB_PATHS + %w{libzmq})
     rescue LoadError => e
       if ZMQ_LIB_PATHS.any? {|path| File.file?(path) } 
         warn "Unable to load this gem. The libzmq library exists, but cannot be loaded."

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-ffi-rzmq.git



More information about the Pkg-ruby-extras-commits mailing list