diff options
| author | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-15 16:10:46 +0000 |
|---|---|---|
| committer | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-15 16:10:46 +0000 |
| commit | 17325a1d33ccb949600fe753ec13162c4447918c (patch) | |
| tree | c198b5c42d14ee8baec3dcc0e32fa935fb5686ec | |
| parent | e2aeaed63382217d3c1591a74fa68435173fd7fd (diff) | |
* 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
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35653 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ext/digest/md5/extconf.rb | 1 | ||||
| -rw-r--r-- | ext/digest/rmd160/extconf.rb | 1 | ||||
| -rw-r--r-- | ext/digest/sha1/extconf.rb | 1 | ||||
| -rw-r--r-- | ext/digest/sha2/extconf.rb | 1 | ||||
| -rw-r--r-- | version.h | 2 |
6 files changed, 14 insertions, 1 deletions
@@ -1,3 +1,12 @@ +Wed May 16 01:07:46 2012 Aaron Patterson <aaron@tenderlovemaking.com> + + * 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@ruby-lang.org> * test/ruby/test_io.rb (test_flush_in_finalizer1): don't use IO.for_fd diff --git a/ext/digest/md5/extconf.rb b/ext/digest/md5/extconf.rb index ddfdb707f2..006aa2ee36 100644 --- a/ext/digest/md5/extconf.rb +++ b/ext/digest/md5/extconf.rb @@ -9,6 +9,7 @@ $INCFLAGS << " -I$(srcdir)/.." $objs = [ "md5init.#{$OBJEXT}" ] dir_config("openssl") +pkg_config("openssl") if !with_config("bundled-md5") && have_library("crypto") && have_header("openssl/md5.h") diff --git a/ext/digest/rmd160/extconf.rb b/ext/digest/rmd160/extconf.rb index cc361e3d2b..0805b719c3 100644 --- a/ext/digest/rmd160/extconf.rb +++ b/ext/digest/rmd160/extconf.rb @@ -9,6 +9,7 @@ $INCFLAGS << " -I$(srcdir)/.." $objs = [ "rmd160init.#{$OBJEXT}" ] dir_config("openssl") +pkg_config("openssl") if !with_config("bundled-rmd160") && have_library("crypto") && have_header("openssl/ripemd.h") diff --git a/ext/digest/sha1/extconf.rb b/ext/digest/sha1/extconf.rb index fa9945cd43..e55965d980 100644 --- a/ext/digest/sha1/extconf.rb +++ b/ext/digest/sha1/extconf.rb @@ -9,6 +9,7 @@ $INCFLAGS << " -I$(srcdir)/.." $objs = [ "sha1init.#{$OBJEXT}" ] dir_config("openssl") +pkg_config("openssl") if !with_config("bundled-sha1") && have_library("crypto") && have_header("openssl/sha.h") diff --git a/ext/digest/sha2/extconf.rb b/ext/digest/sha2/extconf.rb index a8f0198cf0..025f1bac64 100644 --- a/ext/digest/sha2/extconf.rb +++ b/ext/digest/sha2/extconf.rb @@ -9,6 +9,7 @@ $INCFLAGS << " -I$(srcdir)/.." $objs = [ "sha2init.#{$OBJEXT}" ] dir_config("openssl") +pkg_config("openssl") if !with_config("bundled-sha2") && have_library("crypto") && @@ -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 |