mirror of
https://git.freebsd.org/ports.git
synced 2025-05-18 18:13:12 -04:00
36ea0bd83a
- Sync fixes from -devel port : Honour LOCALBASE Honour script languages wanted version variables PR: 154129 Submitted by: Jase Thew <freebsd@beardz.net> Feature safe: yes
42 lines
1.5 KiB
Text
42 lines
1.5 KiB
Text
--- cmake/FindRuby.cmake.orig 2011-01-18 19:54:43.825973597 +0000
|
|
+++ cmake/FindRuby.cmake 2011-01-18 19:57:33.943672013 +0000
|
|
@@ -32,13 +32,12 @@
|
|
ENDIF(RUBY_FOUND)
|
|
|
|
FIND_PROGRAM(RUBY_EXECUTABLE
|
|
- NAMES ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16 ruby
|
|
- PATHS /usr/bin /usr/local/bin /usr/pkg/bin
|
|
+ NAMES ${BSD_RUBY_CMD}
|
|
)
|
|
|
|
IF(RUBY_EXECUTABLE)
|
|
EXECUTE_PROCESS(
|
|
- COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['rubyhdrdir'] || Config::CONFIG['archdir']"
|
|
+ COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['rubyhdrdir'] || Config::CONFIG['topdir']"
|
|
OUTPUT_VARIABLE RUBY_ARCH_DIR
|
|
)
|
|
|
|
@@ -48,12 +47,12 @@
|
|
)
|
|
|
|
EXECUTE_PROCESS(
|
|
- COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['libdir']"
|
|
+ COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::TOPDIR + '/lib'"
|
|
OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH
|
|
)
|
|
|
|
EXECUTE_PROCESS(
|
|
- COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['rubylibdir']"
|
|
+ COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::TOPDIR + '/lib/ruby/' + Config::CONFIG['ruby_version']"
|
|
OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH
|
|
)
|
|
|
|
@@ -78,7 +77,7 @@
|
|
"${RUBY_INCLUDE_PATH}/${RUBY_ARCH}")
|
|
|
|
FIND_LIBRARY(RUBY_LIBRARY
|
|
- NAMES ruby-1.9.2 ruby1.9.2 ruby192 ruby-1.9.1 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16 ruby
|
|
+ NAMES ${BSD_RUBY_VER}
|
|
PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH}
|
|
)
|
|
|