[前][次][番号順一覧][スレッド一覧]

ruby-changes:27221

From: nobu <ko1@a...>
Date: Sat, 16 Feb 2013 13:44:26 +0900 (JST)
Subject: [ruby-changes:27221] nobu:r39273 (trunk): configure.in: don't substitute exec_prefix itself

nobu	2013-02-16 13:40:17 +0900 (Sat, 16 Feb 2013)

  New Revision: 39273

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39273

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

  Modified files:
    trunk/ChangeLog
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 39272)
+++ configure.in	(revision 39273)
@@ -3218,7 +3218,7 @@ shvar_to_cpp() { https://github.com/ruby/ruby/blob/trunk/configure.in#L3218
 	    -e 's/\${rubyarchprefix}/"RUBY_ARCH_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_pat}|"'"RUBY_EXEC_PREFIX"|g' \
+	    -e "s|${exec_prefix_pat}/|"'"RUBY_EXEC_PREFIX"/|g' \
 	    -e "s|${arch_pat}|"'"arch"|g' \
 	    -e "s|${sitearch_pat}|"'"sitearch"|g' \
 	    -e 's|^\"NONE/|RUBY_EXEC_PREFIX\"/|' \
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 39272)
+++ ChangeLog	(revision 39273)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat Feb 16 13:40:13 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* ext/io/console/io-console.gemspec: bump to 0.4.2.  now explicitly

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]