From e38130c1488c8db36d44c61895d65d92aeb12bffea5de286aea117ee1bc6ad36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 14 May 2012 14:31:24 +0000 Subject: [PATCH] Accepting request 120949 from home:coolo:branches:openSUSE:Factory - vendor-specific does no longer exist with ruby 1.9, so don't use it to check vendor support OBS-URL: https://build.opensuse.org/request/show/120949 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=89 --- cmake-fix-ruby-test.patch | 13 +++++++++++++ cmake.changes | 6 ++++++ 2 files changed, 19 insertions(+) create mode 100644 cmake-fix-ruby-test.patch diff --git a/cmake-fix-ruby-test.patch b/cmake-fix-ruby-test.patch new file mode 100644 index 0000000..3ddf18d --- /dev/null +++ b/cmake-fix-ruby-test.patch @@ -0,0 +1,13 @@ +Index: cmake-2.8.8/Modules/FindRuby.cmake +=================================================================== +--- cmake-2.8.8.orig/Modules/FindRuby.cmake 2012-04-18 20:10:54.000000000 +0200 ++++ cmake-2.8.8/Modules/FindRuby.cmake 2012-05-14 15:42:52.137253084 +0200 +@@ -93,7 +93,7 @@ IF(RUBY_EXECUTABLE AND NOT RUBY_VERSIO + _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR) + + # vendor_ruby available ? +- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'" ++ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -e "print 'true' unless Config::CONFIG['vendorarchdir'].blank?" + OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET) + + IF(RUBY_HAS_VENDOR_RUBY) diff --git a/cmake.changes b/cmake.changes index 96f7112..4b0456d 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 14 13:43:06 UTC 2012 - coolo@suse.com + +- vendor-specific does no longer exist with ruby 1.9, so don't use + it to check vendor support + ------------------------------------------------------------------- Tue Apr 24 15:11:45 UTC 2012 - idonmez@suse.com