1 --- ffi-yajl-1.2.0/lib/ffi_yajl/ffi.rb~ 2014-11-12 23:07:49.846221611 +0200
2 +++ ffi-yajl-1.2.0/lib/ffi_yajl/ffi.rb 2014-11-12 23:13:10.000000000 +0200
12 libname = ::FFI.map_library_name("yajl")
13 - # XXX: need to replace ::FFI.map_library_name here as well
14 - libname = "libyajl.so" if libname == "yajl.dll"
15 - libpath = File.expand_path(File.join(Libyajl2.opt_path, libname))
16 - libpath.gsub!(/dylib/, 'bundle')
18 - if File.file?(libpath)
19 - # use our vendored version of libyajl2 if we find it installed
26 class YajlCallbacks < ::FFI::Struct
27 layout :yajl_null, :pointer,
28 --- ruby-ffi-yajl-1.3.1/lib/ffi_yajl/ext.rb 2015-01-22 13:55:11.513182150 +0200
29 +++ ruby-ffi-yajl-1.3.1/lib/ffi_yajl/ext.rb 2015-01-22 13:55:53.882526948 +0200
31 require 'ffi_yajl/encoder'
32 require 'ffi_yajl/parser'
37 - # FIXME: DRY with ffi_yajl/ffi.rb
38 - # FIXME: extract map_library_name from FFI and stop requiring it at the top level
39 - # so that the C-library can be installed without FFI
40 - libname = ::FFI.map_library_name("yajl")
41 - # awful windows patch, but there is an open issue to entirely replace FFI.map_library_name already
42 - libname = "libyajl.so" if libname == "yajl.dll"
43 - libpath = File.expand_path(File.join(Libyajl2.opt_path, libname))
44 - libpath.gsub!(/dylib/, 'bundle')
45 - libpath = ::FFI.map_library_name("yajl") unless File.exist?(libpath)
46 + libpath = 'libyajl.so.2'
49 # FFS, what exactly was so wrong with DL.dlopen that ruby had to get rid of it???
50 --- ffi-yajl-1.2.0/ext/ffi_yajl/ext/encoder/extconf.rb~ 2014-11-12 23:19:03.000000000 +0200
51 +++ ffi-yajl-1.2.0/ext/ffi_yajl/ext/encoder/extconf.rb 2014-11-12 23:20:13.882893756 +0200
57 RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
59 -# pick up the vendored libyajl2 out of the libyajl2 gem
60 -$CFLAGS = " -I#{Libyajl2.include_path} #{$CFLAGS}"
61 -$LDFLAGS = " -L#{Libyajl2.opt_path} #{$LDFLAGS}"
63 # remove "-Wl,--no-undefined" flag if existent to allow for loading with dlopen
64 $LDFLAGS.slice!("-Wl,--no-undefined")
66 --- ffi-yajl-1.2.0/ext/ffi_yajl/ext/parser/extconf.rb~ 2014-11-12 23:19:03.000000000 +0200
67 +++ ffi-yajl-1.2.0/ext/ffi_yajl/ext/parser/extconf.rb 2014-11-12 23:20:29.100220591 +0200
73 RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
75 -# pick up the vendored libyajl2 out of the libyajl2 gem
76 -$CFLAGS = "-I#{Libyajl2.include_path} #{$CFLAGS}"
77 -$LDFLAGS = "-L#{Libyajl2.opt_path} #{$LDFLAGS}"
79 # remove "-Wl,--no-undefined" flag if existent to allow for loading with dlopen
80 $LDFLAGS.slice!("-Wl,--no-undefined")