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

ruby-changes:23603

From: tenderlove <ko1@a...>
Date: Wed, 16 May 2012 01:11:19 +0900 (JST)
Subject: [ruby-changes:23603] tenderlove:r35653 (ruby_1_9_3): * ext/digest/md5/extconf.rb: use pkg_config for openssl so that

tenderlove	2012-05-16 01:10:46 +0900 (Wed, 16 May 2012)

  New Revision: 35653

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

  Log:
    * ext/digest/md5/extconf.rb: use pkg_config for openssl so that
      customized ssl paths are used for linking.  Backports fixes for
      [ruby-core:44755].
    * ext/digest/rmd160/extconf.rb: ditto
    * ext/digest/sha1/extconf.rb: ditto
    * ext/digest/sha2/extconf.rb: ditto

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/ext/digest/md5/extconf.rb
    branches/ruby_1_9_3/ext/digest/rmd160/extconf.rb
    branches/ruby_1_9_3/ext/digest/sha1/extconf.rb
    branches/ruby_1_9_3/ext/digest/sha2/extconf.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 35652)
+++ ruby_1_9_3/ChangeLog	(revision 35653)
@@ -1,3 +1,12 @@
+Wed May 16 01:07:46 2012  Aaron Patterson <aaron@t...>
+
+	* ext/digest/md5/extconf.rb: use pkg_config for openssl so that
+	  customized ssl paths are used for linking.  Backports fixes for
+	  [ruby-core:44755].
+	* ext/digest/rmd160/extconf.rb: ditto
+	* ext/digest/sha1/extconf.rb: ditto
+	* ext/digest/sha2/extconf.rb: ditto
+
 Mon May 14 17:14:10 2012  CHIKANAGA Tomoyuki  <nagachika@r...>
 
 	* test/ruby/test_io.rb (test_flush_in_finalizer1): don't use IO.for_fd
Index: ruby_1_9_3/ext/digest/md5/extconf.rb
===================================================================
--- ruby_1_9_3/ext/digest/md5/extconf.rb	(revision 35652)
+++ ruby_1_9_3/ext/digest/md5/extconf.rb	(revision 35653)
@@ -9,6 +9,7 @@
 $objs = [ "md5init.#{$OBJEXT}" ]
 
 dir_config("openssl")
+pkg_config("openssl")
 
 if !with_config("bundled-md5") &&
     have_library("crypto") && have_header("openssl/md5.h")
Index: ruby_1_9_3/ext/digest/rmd160/extconf.rb
===================================================================
--- ruby_1_9_3/ext/digest/rmd160/extconf.rb	(revision 35652)
+++ ruby_1_9_3/ext/digest/rmd160/extconf.rb	(revision 35653)
@@ -9,6 +9,7 @@
 $objs = [ "rmd160init.#{$OBJEXT}" ]
 
 dir_config("openssl")
+pkg_config("openssl")
 
 if !with_config("bundled-rmd160") &&
     have_library("crypto") && have_header("openssl/ripemd.h")
Index: ruby_1_9_3/ext/digest/sha1/extconf.rb
===================================================================
--- ruby_1_9_3/ext/digest/sha1/extconf.rb	(revision 35652)
+++ ruby_1_9_3/ext/digest/sha1/extconf.rb	(revision 35653)
@@ -9,6 +9,7 @@
 $objs = [ "sha1init.#{$OBJEXT}" ]
 
 dir_config("openssl")
+pkg_config("openssl")
 
 if !with_config("bundled-sha1") &&
     have_library("crypto") && have_header("openssl/sha.h")
Index: ruby_1_9_3/ext/digest/sha2/extconf.rb
===================================================================
--- ruby_1_9_3/ext/digest/sha2/extconf.rb	(revision 35652)
+++ ruby_1_9_3/ext/digest/sha2/extconf.rb	(revision 35653)
@@ -9,6 +9,7 @@
 $objs = [ "sha2init.#{$OBJEXT}" ]
 
 dir_config("openssl")
+pkg_config("openssl")
 
 if !with_config("bundled-sha2") &&
     have_library("crypto") &&
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 35652)
+++ ruby_1_9_3/version.h	(revision 35653)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 214
+#define RUBY_PATCHLEVEL 215
 
 #define RUBY_RELEASE_DATE "2012-05-14"
 #define RUBY_RELEASE_YEAR 2012

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

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