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

ruby-changes:25822

From: nobu <ko1@a...>
Date: Tue, 27 Nov 2012 10:00:39 +0900 (JST)
Subject: [ruby-changes:25822] nobu:r37878 (trunk): extconf.rb: git rid of post-1.8 feature

nobu	2012-11-27 09:58:52 +0900 (Tue, 27 Nov 2012)

  New Revision: 37878

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

  Log:
    extconf.rb: git rid of post-1.8 feature
    
    * ext/digest/*/extconf.rb, ext/openssl/extconf.rb: get git rid of
      post-1.8 feature require_relative for cross compilation.
      [ruby-core:50160] [Bug #7439]

  Modified files:
    trunk/ChangeLog
    trunk/ext/digest/md5/extconf.rb
    trunk/ext/digest/rmd160/extconf.rb
    trunk/ext/digest/sha1/extconf.rb
    trunk/ext/digest/sha2/extconf.rb
    trunk/ext/openssl/extconf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37877)
+++ ChangeLog	(revision 37878)
@@ -1,3 +1,9 @@
+Tue Nov 27 09:58:48 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/digest/*/extconf.rb, ext/openssl/extconf.rb: get git rid of
+	  post-1.8 feature require_relative for cross compilation.
+	  [ruby-core:50160] [Bug #7439]
+
 Tue Nov 27 09:17:59 2012  Koichi Sasada  <ko1@a...>
 
 	* NEWS: add TracePont.
Index: ext/digest/md5/extconf.rb
===================================================================
--- ext/digest/md5/extconf.rb	(revision 37877)
+++ ext/digest/md5/extconf.rb	(revision 37878)
@@ -1,3 +1,4 @@
+# -*- coding: us-ascii -*-
 # $RoughId: extconf.rb,v 1.3 2001/08/14 19:54:51 knu Exp $
 # $Id$
 
@@ -10,7 +11,7 @@
 
 dir_config("openssl")
 pkg_config("openssl")
-require_relative '../../openssl/deprecation'
+require File.expand_path('../../../openssl/deprecation', __FILE__)
 
 if !with_config("bundled-md5") &&
     have_library("crypto") && OpenSSL.check_func("MD5_Transform", "openssl/md5.h")
Index: ext/digest/rmd160/extconf.rb
===================================================================
--- ext/digest/rmd160/extconf.rb	(revision 37877)
+++ ext/digest/rmd160/extconf.rb	(revision 37878)
@@ -1,3 +1,4 @@
+# -*- coding: us-ascii -*-
 # $RoughId: extconf.rb,v 1.3 2001/08/14 19:54:51 knu Exp $
 # $Id$
 
@@ -10,7 +11,7 @@
 
 dir_config("openssl")
 pkg_config("openssl")
-require_relative '../../openssl/deprecation'
+require File.expand_path('../../../openssl/deprecation', __FILE__)
 
 if !with_config("bundled-rmd160") &&
     have_library("crypto") && OpenSSL.check_func("RMD160_Transform", "openssl/ripemd.h")
Index: ext/digest/sha1/extconf.rb
===================================================================
--- ext/digest/sha1/extconf.rb	(revision 37877)
+++ ext/digest/sha1/extconf.rb	(revision 37878)
@@ -1,3 +1,4 @@
+# -*- coding: us-ascii -*-
 # $RoughId: extconf.rb,v 1.3 2001/08/14 19:54:51 knu Exp $
 # $Id$
 
@@ -10,7 +11,7 @@
 
 dir_config("openssl")
 pkg_config("openssl")
-require_relative '../../openssl/deprecation'
+require File.expand_path('../../../openssl/deprecation', __FILE__)
 
 if !with_config("bundled-sha1") &&
     have_library("crypto") && OpenSSL.check_func("SHA1_Transform", "openssl/sha.h")
Index: ext/digest/sha2/extconf.rb
===================================================================
--- ext/digest/sha2/extconf.rb	(revision 37877)
+++ ext/digest/sha2/extconf.rb	(revision 37878)
@@ -1,3 +1,4 @@
+# -*- coding: us-ascii -*-
 # $RoughId: extconf.rb,v 1.4 2001/08/14 19:54:51 knu Exp $
 # $Id$
 
@@ -10,7 +11,7 @@
 
 dir_config("openssl")
 pkg_config("openssl")
-require_relative '../../openssl/deprecation'
+require File.expand_path('../../../openssl/deprecation', __FILE__)
 
 if !with_config("bundled-sha2") &&
     have_library("crypto") &&
Index: ext/openssl/extconf.rb
===================================================================
--- ext/openssl/extconf.rb	(revision 37877)
+++ ext/openssl/extconf.rb	(revision 37878)
@@ -1,3 +1,4 @@
+# -*- coding: us-ascii -*-
 =begin
 = $RCSfile$ -- Generator for Makefile
 
@@ -15,7 +16,7 @@
 =end
 
 require "mkmf"
-require_relative 'deprecation'
+require File.expand_path('../deprecation', __FILE__)
 
 dir_config("openssl")
 dir_config("kerberos")

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

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