Removed libyaml (again).

Since late 2012, Psych vendors libyaml but only uses it if the system
libraries are missing. This causes a problem bootstrapping Rubinius
because the Ruby build dependency most likely needs libyaml installed
to run the Ruby to build Rubinius. We can work around this by using
the previous Rubinius build for platforms (like Heroku) where binaries
need to be built to run on systems without libyaml installed.

configure

@@ -455,7 +455,6 @@ class Configure
 
     feature "execinfo", true
     feature "vendor-zlib", false
-    feature "vendor-yaml", false
     feature "alloc-tracking", false
     feature "fibers", true
     feature "dtrace", false
@@ -752,9 +751,6 @@ int main() { LLVMContext &Context = getGlobalContext(); }
     @ldsharedxx = "#{@cxx} -shared"
     @ldshared   = "#{@cc} -shared"
 
-    @system_cflags << " -Wno-unused-result "
-    @system_cxxflags << " -Wno-unused-result "
-
     @include_dirs.each do |d|
       @system_cflags << "-I#{d} "
     end
@@ -1162,11 +1158,6 @@ int main() { return tgetnum(""); }
   end
 
   def enable_features
-    if @features["vendor-yaml"].value
-      @include_dirs << "#{@vendored_libdir}/libyaml/include"
-      @lib_dirs     << "#{@vendored_libdir}/libyaml/src/.libs"
-    end
-
     if @features["vendor-zlib"].value
       # Our vendored zlib uses long as the crc_table type
       # If we update vendored zlib in the future, we have to
@@ -1282,12 +1273,6 @@ int main() { return tgetnum(""); }
       end
     end
 
-    unless @features["vendor-yaml"].value
-      unless has_header("yaml.h")
-        failure "yaml.h is required"
-      end
-    end
-
     unless has_header("openssl/ssl.h")
       failure "openssl/ssl.h is required"
     end
@@ -1566,7 +1551,6 @@ int main() { return tgetnum(""); }
       :darwin             => @darwin,
       :bsd                => @bsd,
       :linux              => @linux,
-      :vendor_yaml        => @features["vendor-yaml"].value,
       :vendor_zlib        => @features["vendor-zlib"].value,
       :vm_release_h       => @vm_release_h,
       :bootstrap_gems     => @bootstrap_gems,
@@ -1652,10 +1636,6 @@ int main() { return tgetnum(""); }
 
       f.puts "#define RBX_DTRACE_CONST     #{@dtrace_const ? "const" : ""}"
 
-      if @features["vendor-yaml"].value
-        f.puts "#define RBX_VENDOR_YAML      1"
-      end
-
       write_have_defines f
     end
 

rakelib/blueprint.rb

@@ -162,22 +162,6 @@
   gcc.add_library udis
   files << udis
 
-  if Rubinius::BUILD_CONFIG[:vendor_yaml]
-    yaml = i.external_lib "vendor/libyaml" do |l|
-      l.cflags = ["-I#{src}/vendor/libyaml/include"] + gcc.cflags
-      l.objects = [l.file("src/.libs/libyaml.a")]
-      l.to_build do |x|
-        unless File.exist?("Makefile") and File.exist?("config.h")
-          x.command "sh -c './configure --enable-static --disable-shared'"
-        end
-
-        x.command make
-      end
-    end
-    gcc.add_library yaml
-    files << yaml
-  end
-
   if Rubinius::BUILD_CONFIG[:vendor_zlib]
     zlib = i.external_lib "vendor/zlib" do |l|
       l.cflags = ["-I#{src}/vendor/zlib"] + gcc.cflags

vendor/.gitignore

@@ -47,11 +47,3 @@ zlib/minigzip
 zlib/minigzipsh
 zlib/zconf.h
 zlib/zlib.pc
-
-# yaml
-libyaml/config.*
-libyaml/libtool
-libyaml/Makefile
-libyaml/*/Makefile
-libyaml/tests/*
-libyaml/yaml-0.1.pc