summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-21 12:25:29 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-21 12:25:29 +0000
commitc50c9f6d3ba1f9b550c68777569f7d3f8898446f (patch)
treee489da721e365e61d5b6e0ae6942406954430b01
parent4131d6176ac46da95b1e7fa045651783f0a66c65 (diff)
* ext/digest/sha2/extconf.rb: check SHA256_CTX and SHA512_CTX to fix
compilation failure on OpenBSD 4.4. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27433 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/digest/sha2/extconf.rb3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0b3920f943..36361a897c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr 21 21:24:20 2010 Tanaka Akira <akr@fsij.org>
+
+ * ext/digest/sha2/extconf.rb: check SHA256_CTX and SHA512_CTX to fix
+ compilation failure on OpenBSD 4.4.
+
Wed Apr 21 15:13:10 2010 NARUSE, Yui <naruse@ruby-lang.org>
* io.c (io_getc): fix incomplete character immediately before EOF
diff --git a/ext/digest/sha2/extconf.rb b/ext/digest/sha2/extconf.rb
index d4af8702aa..a8f0198cf0 100644
--- a/ext/digest/sha2/extconf.rb
+++ b/ext/digest/sha2/extconf.rb
@@ -12,7 +12,8 @@ dir_config("openssl")
if !with_config("bundled-sha2") &&
have_library("crypto") &&
- %w[SHA256 SHA512].all? {|d| have_func("#{d}_Transform", "openssl/sha.h")}
+ %w[SHA256 SHA512].all? {|d| have_func("#{d}_Transform", "openssl/sha.h")} &&
+ %w[SHA256 SHA512].all? {|d| have_type("#{d}_CTX", "openssl/sha.h")}
$objs << "sha2ossl.#{$OBJEXT}"
$defs << "-DSHA2_USE_OPENSSL"
else