1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure.in: don't substitute exec_prefix itself

Browse Source 
* configure.in (shvar_to_cpp): do not substitute exec_prefix itself
  with RUBY_EXEC_PREFIX, which cause recursive definition.
  [ruby-core:52296] [Bug #7860]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39273 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-02-16 04:40:17 +00:00
parent 78b50f26dc
commit bb7e19c8e9
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sat Feb 16 13:40:13 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (shvar_to_cpp): do not substitute exec_prefix itself
with RUBY_EXEC_PREFIX, which cause recursive definition.
[ruby-core:52296] [Bug #7860]
Sat Feb 16 13:13:04 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Feb 16 13:13:04 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/io/console/io-console.gemspec: bump to 0.4.2. now explicitly * ext/io/console/io-console.gemspec: bump to 0.4.2. now explicitly

2
configure.in
View File

@ -3218,7 +3218,7 @@ shvar_to_cpp() {
-e 's/\${rubyarchprefix}/"RUBY_ARCH_PREFIX_FOR(arch)"/g' \ -e 's/\${rubyarchprefix}/"RUBY_ARCH_PREFIX_FOR(arch)"/g' \
-e 's/\${rubysitearchprefix}/"RUBY_SITEARCH_PREFIX_FOR(arch)"/g' \ -e 's/\${rubysitearchprefix}/"RUBY_SITEARCH_PREFIX_FOR(arch)"/g' \
-e 's/\${exec_prefix}/"RUBY_EXEC_PREFIX"/g' \ -e 's/\${exec_prefix}/"RUBY_EXEC_PREFIX"/g' \
-e "s|${exec_prefix_pat}|"'"RUBY_EXEC_PREFIX"|g' \ -e "s|${exec_prefix_pat}/|"'"RUBY_EXEC_PREFIX"/|g' \
-e "s|${arch_pat}|"'"arch"|g' \ -e "s|${arch_pat}|"'"arch"|g' \
-e "s|${sitearch_pat}|"'"sitearch"|g' \ -e "s|${sitearch_pat}|"'"sitearch"|g' \
-e 's|^\"NONE/|RUBY_EXEC_PREFIX\"/|' \ -e 's|^\"NONE/|RUBY_EXEC_PREFIX\"/|' \