Merge pull request #2306 from paddor/master

Problem: Ruby bindings outdated with regards to zproject
zeromq · Nov 28, 2024 · 5b5c640 · 5b5c640
2 parents 5a8d6d8 + 7673b7f
commit 5b5c640
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/bindings/ruby/lib/czmq/ffi.rb b/bindings/ruby/lib/czmq/ffi.rb
@@ -21,12 +21,21 @@ def self.available?
     end
 
     begin
-      lib_name = 'libczmq'
-      lib_dirs = ['/usr/local/lib', '/opt/local/lib', '/usr/lib64']
-      env_name = "#{lib_name.upcase}_PATH"
-      lib_dirs = [*ENV[env_name].split(':'), *lib_dirs] if ENV[env_name]
-      lib_paths = lib_dirs.map { |path| "#{path}/#{lib_name}.#{::FFI::Platform::LIBSUFFIX}" }
-      ffi_lib lib_paths + [lib_name]
+      lib_name      = 'libczmq'
+      major_version = '4'
+      lib_dirs      = ['/usr/local/lib', '/opt/local/lib', '/usr/lib64', '/usr/lib']
+      lib_dirs      = [*ENV['LD_LIBRARY_PATH'].split(':'), *lib_dirs] if ENV['LD_LIBRARY_PATH']
+      lib_dirs      = [*ENV["#{lib_name.upcase}_PATH"].split(':'), *lib_dirs] if ENV["#{lib_name.upcase}_PATH"]
+      lib_paths     = lib_dirs.map do |path|
+        [
+          "#{path}/#{lib_name}.#{::FFI::Platform::LIBSUFFIX}",
+          "#{path}/#{lib_name}.#{::FFI::Platform::LIBSUFFIX}.#{major_version}"
+        ]
+      end.flatten
+
+      lib_paths.concat [lib_name, "#{lib_name}.#{::FFI::Platform::LIBSUFFIX}.#{major_version}"]
+
+      ffi_lib lib_paths
       @available = true
     rescue LoadError
       warn ""