5 files changed, 19 insertions, 64 deletions

diff --git a/lang/rubinius/files/patch-configure b/lang/rubinius/files/patch-configure
deleted file mode 100644
index e48cb19384de..000000000000
--- a/lang/rubinius/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig	2010-10-11 00:13:35.000000000 -0700
-+++ configure	2010-10-11 00:16:22.000000000 -0700
-@@ -316,7 +316,9 @@
-     path = File.join @llvm_prebuilt_path, @llvm_source
- 
-     puts "  Downloading #{url}..."
--    return false unless download(url, path)
-+    if not File.exists?(path)
-+      return false unless download(url, path)
-+    end
- 
-     if File.exists?(path)
-       print "  Unpacking prebuilt LLVM source: "
diff --git a/lang/rubinius/files/patch-kernel_platform_library.rb b/lang/rubinius/files/patch-kernel_platform_library.rb
deleted file mode 100644
index 8711715117ac..000000000000
--- a/lang/rubinius/files/patch-kernel_platform_library.rb
+++ /dev/null
@@ -1,22 +0,0 @@
---- kernel/platform/library.rb.orig	2010-10-11 00:22:14.000000000 -0700
-+++ kernel/platform/library.rb	2010-10-11 00:23:09.000000000 -0700
-@@ -187,7 +187,7 @@
- 
-     dlopen = find_symbol(FFI::Pointer::CURRENT_PROCESS, "dlopen")
- 
--    pointer_as_function :open_library, dlopen, [:string, :int], :pointer
-+    pointer_as_function :open_library, FFI::Pointer::DLOPEN, [:string, :int], :pointer
- 
-     dlerror = find_symbol(FFI::Pointer::CURRENT_PROCESS, "dlerror")
- 
-@@ -195,8 +195,8 @@
- 
-     RTLD_LAZY = 0x1
-     RTLD_NOW  = 0x2
--    RTLD_GLOBAL = 0x4
--    RTLD_LOCAL  = 0x8
-+    RTLD_GLOBAL = 0x100
-+    RTLD_LOCAL  = 0x0
- 
-     class << self
-       alias_method :open, :new
diff --git a/lang/rubinius/files/patch-rakelib_install.rake b/lang/rubinius/files/patch-rakelib_install.rake
new file mode 100644
index 000000000000..dba8f241a880
--- /dev/null
+++ b/lang/rubinius/files/patch-rakelib_install.rake
@@ -0,0 +1,19 @@
+--- rakelib/install.rake.orig	2011-01-10 17:37:36.000000000 -0800
++++ rakelib/install.rake	2011-01-10 17:38:07.000000000 -0800
+@@ -137,16 +137,6 @@
+       exe = "#{BUILD_CONFIG[:bindir]}/#{BUILD_CONFIG[:program_name]}"
+       install "vm/vm", install_dir(exe), :mode => 0755, :verbose => true
+ 
+-      # Create symlinks for common commands
+-      begin
+-        ["ruby", "rake", "gem", "irb", "rdoc", "ri"].each do |command|
+-          name = "#{BUILD_CONFIG[:bindir]}/#{command}"
+-          File.symlink BUILD_CONFIG[:program_name], install_dir(name)
+-        end
+-      rescue NotImplementedError
+-        # ignore
+-      end
+-
+       STDOUT.puts <<-EOM
+ --------
+ 
diff --git a/lang/rubinius/files/patch-vm_builtin_ffi_pointer.cpp b/lang/rubinius/files/patch-vm_builtin_ffi_pointer.cpp
deleted file mode 100644
index 027833ef1be5..000000000000
--- a/lang/rubinius/files/patch-vm_builtin_ffi_pointer.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- vm/builtin/ffi_pointer.cpp.orig	2010-10-11 00:23:21.000000000 -0700
-+++ vm/builtin/ffi_pointer.cpp	2010-10-11 00:23:59.000000000 -0700
-@@ -38,6 +38,9 @@
-     G(ffi_pointer)->set_const(state, "DLSYM",
-       Pointer::create(state, (void*)dlsym));
- 
-+    G(ffi_pointer)->set_const(state, "DLOPEN",
-+      Pointer::create(state, (void*)dlopen));
-+
-     // Not exactly the right place, but FFI needs this and this is the main
-     // FFI file atm.
-     Array* suffix = Array::create(state, 2);
diff --git a/lang/rubinius/files/patch-vm_environment.cpp b/lang/rubinius/files/patch-vm_environment.cpp
deleted file mode 100644
index 99859d2a18c7..000000000000
--- a/lang/rubinius/files/patch-vm_environment.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- vm/environment.cpp.orig	2010-10-11 01:11:37.000000000 -0700
-+++ vm/environment.cpp	2010-10-11 01:11:51.000000000 -0700
-@@ -108,13 +108,12 @@
- 
-   static void null_func(int sig) {}
- 
-+#ifdef USE_EXECINFO
-   static void safe_write(int fd, const char* str, int len=0) {
-     if(!len) len = strlen(str);
-     if(write(fd, str, len) == 0) exit(101);
-   }
- 
--#ifdef USE_EXECINFO
--
-   static void write_sig(int fd, int sig) {
-     switch(sig) {
-     case SIGSEGV: