diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2014-10-09 18:48:45 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2014-10-09 18:48:45 -0700 |
| commit | d2634a2d806252ee091e9d17d8fc30ed894d850d (patch) | |
| tree | ba184b946242391abcbc16bdc1364e2c420510ac /lib | |
| parent | 6e19eb693350f198f9b18609c3f1a89b3138b79e (diff) | |
| parent | 13634a8463cddcb84007795761622eb34b6c02fa (diff) | |
| download | ffi-yajl-d2634a2d806252ee091e9d17d8fc30ed894d850d.tar.gz | |
Merge pull request #27 from opscode/lcg/windows-libname
fix libnames for windows
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ffi_yajl/ext.rb | 2 | ||||
| -rw-r--r-- | lib/ffi_yajl/ffi.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/ffi_yajl/ext.rb b/lib/ffi_yajl/ext.rb index b645972..3b055ea 100644 --- a/lib/ffi_yajl/ext.rb +++ b/lib/ffi_yajl/ext.rb @@ -10,6 +10,8 @@ module FFI_Yajl # FIXME: extract map_library_name from FFI and stop requiring it at the top level # so that the C-library can be installed without FFI libname = ::FFI.map_library_name("yajl") + # awful windows patch, but there is an open issue to entirely replace FFI.map_library_name already + libname = "libyajl.so" if libname == "yajl.dll" libpath = File.expand_path(File.join(Libyajl2.opt_path, libname)) libpath.gsub!(/dylib/, 'bundle') libpath = ::FFI.map_library_name("yajl") unless File.exist?(libpath) diff --git a/lib/ffi_yajl/ffi.rb b/lib/ffi_yajl/ffi.rb index 1510bcc..4e685a6 100644 --- a/lib/ffi_yajl/ffi.rb +++ b/lib/ffi_yajl/ffi.rb @@ -7,6 +7,8 @@ module FFI_Yajl extend ::FFI::Library libname = ::FFI.map_library_name("yajl") + # XXX: need to replace ::FFI.map_library_name here as well + libname = "libyajl.so" if libname == "yajl.dll" libpath = File.expand_path(File.join(Libyajl2.opt_path, libname)) libpath.gsub!(/dylib/, 'bundle') |