- Fix cmake-fix-ruby-test.patch, Config:: is removed in Ruby 2.2,

use RbConfig:: instead

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=214
This commit is contained in:
Klaus Kämpf 2015-05-19 08:35:29 +00:00 committed by Git OBS Bridge
parent ca67974e76
commit 9ec516a52c
2 changed files with 7 additions and 1 deletions

View File

@ -5,7 +5,7 @@
# vendor_ruby available ? # vendor_ruby available ?
- execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'" - execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'"
+ execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print 'true' unless Config::CONFIG['vendorarchdir'].nil?" + execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print 'true' unless RbConfig::CONFIG['vendorarchdir'].nil?"
OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET) OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET)
if(RUBY_HAS_VENDOR_RUBY) if(RUBY_HAS_VENDOR_RUBY)

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue May 19 08:34:49 UTC 2015 - kkaempf@suse.com
- Fix cmake-fix-ruby-test.patch, Config:: is removed in Ruby 2.2,
use RbConfig:: instead
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 14 18:42:34 UTC 2015 - olaf@aepfle.de Thu May 14 18:42:34 UTC 2015 - olaf@aepfle.de