SHA256
3
0
forked from pool/cmake

Accepting request 122874 from devel:tools:building

- fix the ruby test patch once more to also work with ruby 1.8

OBS-URL: https://build.opensuse.org/request/show/122874
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cmake?expand=0&rev=57
This commit is contained in:
Stephan Kulow 2012-05-31 15:02:58 +00:00 committed by Git OBS Bridge
commit cf153bfb75
2 changed files with 6 additions and 1 deletions

View File

@ -7,7 +7,7 @@ Index: cmake-2.8.8/Modules/FindRuby.cmake
# 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} -e "print 'true' unless Config::CONFIG['vendorarchdir'].nil?" + EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print 'true' unless Config::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,8 @@
-------------------------------------------------------------------
Wed May 30 09:51:04 UTC 2012 - coolo@suse.com
- fix the ruby test patch once more to also work with ruby 1.8
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 14 13:43:06 UTC 2012 - coolo@suse.com Mon May 14 13:43:06 UTC 2012 - coolo@suse.com