Patchwork [meta-ruby] ruby overwrites configuration files in ruby-native

login
register
mail settings
Submitter Amy Fong
Date May 22, 2014, 8:45 p.m.
Message ID <20140522204514.GA29369@windriver.com>
Download mbox | patch
Permalink /patch/72613/
State Accepted, archived
Headers show

Comments

Amy Fong - May 22, 2014, 8:45 p.m.
From 11b1e17a6dfdd84b3969c17b1b85b3b9bb934d11 Mon Sep 17 00:00:00 2001
From: Amy Fong <amy.fong@windriver.com>
Date: Thu, 22 May 2014 16:43:40 -0400
Subject: [PATCH] ruby overwrites configuration files in ruby-native

ruby's install rule is calling install-cross, this overwrites files installed
by ruby-native causing build failures with ruby apps, specifically where gems
are involved, especially on hosts where there is no host ruby:

(from sysroot-native's gem)
gem env
 RubyGems Environment:
   - RUBYGEMS VERSION: 1.8.23
   - RUBY VERSION: 1.9.3 (2012-04-20 patchlevel 194) [x86_64-linux]
   - INSTALLATION DIRECTORY: /usr/lib64/ruby/gems/1.9.1
   - RUBY EXECUTABLE: /usr/bin/ruby
   - EXECUTABLE DIRECTORY: /usr/bin
   - RUBYGEMS PLATFORMS:
     - ruby
     - x86_64-linux
   - GEM PATHS:
      - /usr/lib64/ruby/gems/1.9.1
      - /folk/afong/.gem/ruby/1.9.1
   - GEM CONFIGURATION:
      - :update_sources => true
      - :verbose => true
      - :benchmark => false
      - :backtrace => false
      - :bulk_threshold => 1000
   - REMOTE SOURCES:
      - http://rubygems.org/

Files affected - fake.rb, rbconfig.rb, config.h, win32.h and ruby libraries.
We should be using the versions from ruby-native.

Signed-off-by: Amy Fong <amy.fong@windriver.com>
---
 meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p429.bb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

Patch

diff --git a/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p429.bb b/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p429.bb
index 883bb98..bb4bab8 100644
--- a/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p429.bb
+++ b/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p429.bb
@@ -28,11 +28,7 @@  EXTRA_OEMAKE = " \
 "
 
 do_install() {
-    if [ ${PN} = "ruby" ]; then
-        oe_runmake 'DESTDIR=${D}' install install-cross
-    else
-        oe_runmake 'DESTDIR=${D}' install
-    fi
+    oe_runmake 'DESTDIR=${D}' install
 }
 
 FILES_${PN} += "${datadir}/rubygems \