From d7668c5fd25519a6b3a0a53b92e1b27dbe832af2 Mon Sep 17 00:00:00 2001
From: Yuichiro MASUI <masui@masuidrive.jp>
Date: Fri, 4 Jan 2013 01:31:58 +0900
Subject: Fixed pure ruby mrbgems can't compile and fixed build script wrong
 variable name

---
 tasks/mruby_build.rake    | 8 ++++----
 tasks/mruby_gem_spec.rake | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tasks/mruby_build.rake b/tasks/mruby_build.rake
index fad92c5e1..65c80ab6a 100644
--- a/tasks/mruby_build.rake
+++ b/tasks/mruby_build.rake
@@ -20,7 +20,7 @@ module MRuby
     attr_accessor :ld, :ldflags, :libs
     attr_accessor :ar
     attr_writer :cxx, :cxxflags
-    attr_writer :objcc, :objccflags
+    attr_writer :objcc, :objcflags
     attr_writer :asm, :asmflags
     attr_accessor :gperf, :yacc
     attr_accessor :cat, :git
@@ -46,13 +46,13 @@ module MRuby
     end
 
     def cxx; @cxx || cc; end
-    def cxxflags; @cxxflags.empty? ? cflags : @cxxflags; end
+    def cxxflags; !@cxxflags || @cxxflags.empty? ? cflags : @cxxflags; end
 
     def objcc; @objcc || cc; end
-    def objccflags; @objccflags.empty? ? cflags : @objccflags; end
+    def objcflags; !@objcflags || @objcflags.empty? ? cflags : @objcflags; end
 
     def asm; @asm || cc; end
-    def asmflags; @asmflags.empty? ? cflags : @asmflags; end
+    def asmflags; !@asmflags || @asmflags.empty? ? cflags : @asmflags; end
 
     def ld; @ld || cc; end
 
diff --git a/tasks/mruby_gem_spec.rake b/tasks/mruby_gem_spec.rake
index 59a536e2c..ae6d46b95 100644
--- a/tasks/mruby_gem_spec.rake
+++ b/tasks/mruby_gem_spec.rake
@@ -147,7 +147,7 @@ __EOF__
           build.compile_mruby f, rbfiles, "gem_mrblib_irep_#{funcname}" unless rbfiles.empty?
           f.puts "void mrb_#{funcname}_gem_init(mrb_state *mrb);"
           f.puts "void GENERATED_TMP_mrb_#{funcname}_gem_init(mrb_state *mrb) {"
-          f.puts "  mrb_#{funcname}_gem_init(mrb);" unless objs.empty?
+          f.puts "  mrb_#{funcname}_gem_init(mrb);" if objs != ["#{build_dir}/gem_init.o"]
           f.puts <<__EOF__ unless rbfiles.empty?
   mrb_load_irep(mrb, gem_mrblib_irep_#{funcname});
   if (mrb->exc) {
-- 
cgit v1.2.3


From af75d8de2ca6b3eda97c588334b15920e856a53b Mon Sep 17 00:00:00 2001
From: Daniel Bovensiepen <daniel@bovensiepen.net>
Date: Tue, 8 Jan 2013 10:07:15 +0800
Subject: Export mrb_ary_clear in array.h

---
 include/mruby/array.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/mruby/array.h b/include/mruby/array.h
index 2857ec75d..c5959bbe6 100644
--- a/include/mruby/array.h
+++ b/include/mruby/array.h
@@ -55,6 +55,7 @@ mrb_value mrb_ary_new4(mrb_state *mrb, int n, const mrb_value *elts);
 mrb_value mrb_assoc_new(mrb_state *mrb, mrb_value car, mrb_value cdr);
 mrb_value mrb_ary_entry(mrb_value ary, int offset);
 mrb_value mrb_ary_shift(mrb_state *mrb, mrb_value self);
+mrb_value mrb_ary_clear(mrb_state *mrb, mrb_value self);
 
 #if defined(__cplusplus)
 }  /* extern "C" { */
-- 
cgit v1.2.3