summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ext/digest/md5/extconf.rb3
-rw-r--r--ext/digest/rmd160/extconf.rb3
-rw-r--r--ext/digest/sha1/extconf.rb3
-rw-r--r--ext/digest/sha2/extconf.rb3
-rw-r--r--ext/openssl/extconf.rb3
6 files changed, 16 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index e4b0fdd9c1..246874c8bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Nov 27 09:58:48 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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@atdot.net>
* NEWS: add TracePont.
diff --git a/ext/digest/md5/extconf.rb b/ext/digest/md5/extconf.rb
index f1dd9122b4..5a57fd3eea 100644
--- a/ext/digest/md5/extconf.rb
+++ b/ext/digest/md5/extconf.rb
@@ -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 @@ $objs = [ "md5init.#{$OBJEXT}" ]
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")
diff --git a/ext/digest/rmd160/extconf.rb b/ext/digest/rmd160/extconf.rb
index b7aed39ef9..d487d6da80 100644
--- a/ext/digest/rmd160/extconf.rb
+++ b/ext/digest/rmd160/extconf.rb
@@ -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 @@ $objs = [ "rmd160init.#{$OBJEXT}" ]
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")
diff --git a/ext/digest/sha1/extconf.rb b/ext/digest/sha1/extconf.rb
index a4d5bbcf48..d7e52fe731 100644
--- a/ext/digest/sha1/extconf.rb
+++ b/ext/digest/sha1/extconf.rb
@@ -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 @@ $objs = [ "sha1init.#{$OBJEXT}" ]
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")
diff --git a/ext/digest/sha2/extconf.rb b/ext/digest/sha2/extconf.rb
index 05d0b8de33..5ab2d35af5 100644
--- a/ext/digest/sha2/extconf.rb
+++ b/ext/digest/sha2/extconf.rb
@@ -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 @@ $objs = [ "sha2init.#{$OBJEXT}" ]
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") &&
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
index 8ac7f7cabd..3d411e0da6 100644
--- a/ext/openssl/extconf.rb
+++ b/ext/openssl/extconf.rb
@@ -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")