Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed that the gem links against different openssl library than eventmachine and ruby #22

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@ ext/*.log
ext/*.o
ext/*.dll
ext/*.bundle
ext/*.so
ext/*.so
.rvmrc
Gemfile.lock
3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source 'https://rubygems.org'

gemspec
23 changes: 14 additions & 9 deletions eventmachine_httpserver.gemspec
Original file line number Diff line number Diff line change
@@ -1,31 +1,36 @@
# -*- encoding: utf-8 -*-

Gem::Specification.new do |s|
s.name = %q{eventmachine_httpserver}
s.version = "0.2.1"
s.name = "eventmachine_httpserver"
s.version = "0.3.0"

s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Francis Cianfrocca"]
s.date = %q{2007-03-16}
s.description = %q{}
s.email = %q{[email protected]}
s.date = "2013-03-28"
s.description = ""
s.email = "[email protected]"
s.extensions = ["ext/extconf.rb"]
s.extra_rdoc_files = ["docs/COPYING", "docs/README", "docs/RELEASE_NOTES"]
s.files = ["README", "Rakefile", "docs/COPYING", "docs/README", "docs/RELEASE_NOTES", "eventmachine_httpserver.gemspec", "eventmachine_httpserver.gemspec.tmpl", "ext/extconf.rb", "ext/http.cpp", "ext/http.h", "ext/rubyhttp.cpp", "lib/evma_httpserver.rb", "lib/evma_httpserver/response.rb", "test/test_app.rb", "test/test_delegated.rb", "test/test_response.rb"]
s.homepage = %q{https://github.com/eventmachine/evma_httpserver}
s.homepage = "https://github.com/eventmachine/evma_httpserver"
s.rdoc_options = ["--title", "EventMachine_HttpServer", "--main", "docs/README", "--line-numbers"]
s.require_paths = ["lib"]
s.required_ruby_version = Gem::Requirement.new("> 0.0.0")
s.rubygems_version = %q{1.3.7}
s.summary = %q{EventMachine HTTP Server}
s.rubygems_version = "1.8.25"
s.summary = "EventMachine HTTP Server"

if s.respond_to? :specification_version then
current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
s.specification_version = 1

if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.6"])
s.add_development_dependency(%q<rake>, [">= 0"])
else
s.add_dependency(%q<eventmachine>, [">= 0.12.6"])
s.add_dependency(%q<rake>, [">= 0"])
end
else
s.add_dependency(%q<eventmachine>, [">= 0.12.6"])
s.add_dependency(%q<rake>, [">= 0"])
end
end
8 changes: 6 additions & 2 deletions eventmachine_httpserver.gemspec.tmpl
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Gem::Specification.new do |s|
s.name = %q{eventmachine_httpserver}
s.version = "0.2.1"
s.version = "0.3.0"

s.specification_version = 1 if s.respond_to? :specification_version=

s.required_rubygems_version = nil if s.respond_to? :required_rubygems_version=
s.authors = ["Francis Cianfrocca"]
s.date = %q{2007-03-16}
s.date = Time.now.strftime('%Y-%m-%d')
s.description = %q{}
s.email = %q{[email protected]}
s.extensions = ["ext/extconf.rb"]
Expand All @@ -19,4 +19,8 @@ Gem::Specification.new do |s|
s.required_ruby_version = Gem::Requirement.new("> 0.0.0")
s.rubygems_version = %q{1.3.1}
s.summary = %q{EventMachine HTTP Server}

s.add_runtime_dependency("eventmachine", '>= 0.12.6')
s.add_development_dependency("rake")

end
6 changes: 3 additions & 3 deletions ext/extconf.rb
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
flags << '-D OS_SOLARIS8'
flags << '-D BUILD_FOR_RUBY'

dir_config('ssl')
pkg_config('openssl') || dir_config('ssl')
if have_library('ssl') and
have_library('crypto') and
have_header('openssl/ssl.h') and
Expand All @@ -81,7 +81,7 @@
flags << '-DOS_UNIX'
flags << '-DBUILD_FOR_RUBY'

dir_config('ssl')
pkg_config('openssl') || dir_config('ssl')
if have_library('ssl') and
have_library('crypto') and
have_library('C') and
Expand All @@ -103,7 +103,7 @@
flags << '-DOS_UNIX'
flags << '-DBUILD_FOR_RUBY'

dir_config('ssl')
pkg_config('openssl') || dir_config('ssl')
if have_library('ssl') and
have_library('crypto') and
have_header('openssl/ssl.h') and
Expand Down