[oe-commits] Amy Fong : ruby overwrites configuration files in ruby-native
git at git.openembedded.org
git at git.openembedded.org
Tue Jun 10 10:30:46 UTC 2014
Module: meta-openembedded.git
Branch: master
Commit: 23961504590ff7e962e097a94567d9f862494568
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=23961504590ff7e962e097a94567d9f862494568
Author: Amy Fong <amy.fong at windriver.com>
Date: Thu May 22 16:43:40 2014 -0400
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 at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p429.bb | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
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 48a65a9..ddba0da 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
@@ -33,11 +33,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 \
More information about the Openembedded-commits
mailing list