From 7fda1869e361196913518675a6421ff2ddae0ea3 Mon Sep 17 00:00:00 2001 From: Luiz Angelo Daros de Luca Date: Sat, 4 Oct 2014 17:35:11 -0300 Subject: [PATCH] ruby: remove minitest deps on gems minitest can live without gems. Just a minor fix to solve a require that fails when gem is missing Signed-off-by: Luiz Angelo Daros de Luca --- lang/ruby/Makefile | 2 +- .../ruby/patches/002-minitest-remove_gems_dep.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 lang/ruby/patches/002-minitest-remove_gems_dep.patch diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile index dfdac6f91..ce622084b 100644 --- a/lang/ruby/Makefile +++ b/lang/ruby/Makefile @@ -16,7 +16,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ruby PKG_VERSION:=2.1.2 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_LIBVER:=2.1 diff --git a/lang/ruby/patches/002-minitest-remove_gems_dep.patch b/lang/ruby/patches/002-minitest-remove_gems_dep.patch new file mode 100644 index 000000000..f53490eee --- /dev/null +++ b/lang/ruby/patches/002-minitest-remove_gems_dep.patch @@ -0,0 +1,13 @@ +--- ruby-2.1.2.orig/lib/minitest/autorun.rb 2014-09-03 02:22:29.769909573 -0300 ++++ ruby-2.1.2/lib/minitest/autorun.rb 2014-09-03 02:22:29.768909580 -0300 +@@ -6,8 +6,9 @@ + ###################################################################### + + begin +- require 'rubygems' + gem 'minitest' ++rescue NameError => e # --disable-gems ++ raise unless e.name == :gem + rescue Gem::LoadError + # do nothing + end