system-yajl.patch

   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
   3 @@ -1,23 +1,10 @@
   4 -require 'rubygems'
   5 -
   6 -require 'libyajl2'
   7  require 'ffi'
   8
   9  module FFI_Yajl
  10    extend ::FFI::Library
  11
  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')
  17 -
  18 -  if File.file?(libpath)
  19 -    # use our vendored version of libyajl2 if we find it installed
  20 -    ffi_lib libpath
  21 -  else
  22 -    ffi_lib 'yajl'
  23 -  end
  24 +  ffi_lib 'yajl.so.2'
  25
  26    class YajlCallbacks < ::FFI::Struct
  27      layout :yajl_null, :pointer,
  28 --- ffi-yajl-1.2.0/ext/ffi_yajl/ext/encoder/extconf.rb~ 2014-11-12 23:19:03.000000000 +0200
  29 +++ ffi-yajl-1.2.0/ext/ffi_yajl/ext/encoder/extconf.rb  2014-11-12 23:20:13.882893756 +0200
  30 @@ -1,13 +1,8 @@
  31  require 'mkmf'
  32  require 'rubygems'
  33 -require 'libyajl2'
  34
  35  RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
  36
  37 -# pick up the vendored libyajl2 out of the libyajl2 gem
  38 -$CFLAGS = " -I#{Libyajl2.include_path} #{$CFLAGS}"
  39 -$LDFLAGS = " -L#{Libyajl2.opt_path} #{$LDFLAGS}"
  40 -
  41  # remove "-Wl,--no-undefined" flag if existent to allow for loading with dlopen
  42  $LDFLAGS.slice!("-Wl,--no-undefined")
  43
  44 --- ffi-yajl-1.2.0/ext/ffi_yajl/ext/parser/extconf.rb~  2014-11-12 23:19:03.000000000 +0200
  45 +++ ffi-yajl-1.2.0/ext/ffi_yajl/ext/parser/extconf.rb   2014-11-12 23:20:29.100220591 +0200
  46 @@ -1,13 +1,8 @@
  47  require 'mkmf'
  48  require 'rubygems'
  49 -require 'libyajl2'
  50
  51  RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
  52
  53 -# pick up the vendored libyajl2 out of the libyajl2 gem
  54 -$CFLAGS = "-I#{Libyajl2.include_path} #{$CFLAGS}"
  55 -$LDFLAGS = "-L#{Libyajl2.opt_path} #{$LDFLAGS}"
  56 -
  57  # remove "-Wl,--no-undefined" flag if existent to allow for loading with dlopen
  58  $LDFLAGS.slice!("-Wl,--no-undefined")
  59