From d954a1bfab9228d66848ca61564746b3f9ba2f0f Mon Sep 17 00:00:00 2001
From: Jason Potkanski <electrawn@yahoo.com>
Date: Tue, 14 Oct 2014 10:52:43 -0500
Subject: Update extconf.rb

Add Cygwin detection
---
 ext/libyajl2/extconf.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/libyajl2/extconf.rb b/ext/libyajl2/extconf.rb
index 1e94507..0800f1f 100644
--- a/ext/libyajl2/extconf.rb
+++ b/ext/libyajl2/extconf.rb
@@ -24,7 +24,7 @@ module Libyajl2Build
   PREFIX = File.expand_path("../../../lib/libyajl2/vendored-libyajl2", __FILE__).freeze
 
   def self.windows?
-    !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
+    !!(RUBY_PLATFORM =~ /mswin|mingw|cygwin|windows/)
   end
 
   def self.libyajl2_vendor_dir
-- 
cgit v1.2.1


From e11f81c3b5d00e11226c308b306e21ab7beb3969 Mon Sep 17 00:00:00 2001
From: Jason Potkanski <electrawn@yahoo.com>
Date: Tue, 14 Oct 2014 11:49:41 -0500
Subject: Update Rakefile

Patch needs to be in binary on windows, as line endings may be different. If patch fails, generate_yajl_version doesn't get called.
---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index 4288565..7891676 100644
--- a/Rakefile
+++ b/Rakefile
@@ -95,7 +95,7 @@ task :prep do
   # apply patches that haven't yet been pushed upstream
   Dir["#{build_path}/patches/*"].sort.each do |file|
     Dir.chdir build_path
-    sh "patch -p2 < #{file}"
+    sh "patch -p2 --binary < #{file}"
   end
 
   # generate the yajl_version.h header file without invoking cmake
-- 
cgit v1.2.1