diff options
| author | CoprDistGit <infra@openeuler.org> | 2024-05-27 03:15:38 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2024-05-27 03:15:38 +0000 |
| commit | d525b748b19d678132e5df61c032e0bba6ac2117 (patch) | |
| tree | 6a903fbb178476c99a64f2a89d3755de8eb7e962 /cmake-findruby.patch | |
| parent | a2f31a97c16070e74e5ce86120718f6dc8d80ac5 (diff) | |
automatic import of cmakeopeneuler23.09openeuler23.03openeuler22.09openeuler22.03_LTS_SP3openeuler22.03_LTS_SP2openeuler22.03_LTSopeneuler20.03
Diffstat (limited to 'cmake-findruby.patch')
| -rw-r--r-- | cmake-findruby.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/cmake-findruby.patch b/cmake-findruby.patch new file mode 100644 index 0000000..72a8b25 --- /dev/null +++ b/cmake-findruby.patch @@ -0,0 +1,22 @@ +Index: cmake-3.23.0-rc2/Modules/FindRuby.cmake +=================================================================== +--- cmake-3.23.0-rc2.orig/Modules/FindRuby.cmake ++++ cmake-3.23.0-rc2/Modules/FindRuby.cmake +@@ -315,14 +315,9 @@ if(Ruby_EXECUTABLE AND NOT Ruby_VERSION_ + _RUBY_CONFIG_VAR("sitearchdir" Ruby_SITEARCH_DIR) + _RUBY_CONFIG_VAR("sitelibdir" Ruby_SITELIB_DIR) + +- # vendor_ruby available ? +- execute_process(COMMAND ${Ruby_EXECUTABLE} -r vendor-specific -e "print 'true'" +- OUTPUT_VARIABLE Ruby_HAS_VENDOR_RUBY ERROR_QUIET) +- +- if(Ruby_HAS_VENDOR_RUBY) +- _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR) +- _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR) +- endif() ++ # vendor_ruby ++ _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR) ++ _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR) + + # save the results in the cache so we don't have to run ruby the next time again + set(Ruby_VERSION_MAJOR ${Ruby_VERSION_MAJOR} CACHE PATH "The Ruby major version" FORCE) |