commit 5ef7a241d2110a3b9ec0baef0e013eb24be98e4f
parent d4e1cfe0e6304a986b1bc2a124db4a89e37af804
Author: Gaute Hope <eg@gaute.vetsj.com>
Date: Thu, 18 Sep 2014 08:06:31 +0200
gemfile: specify xapian-ruby dep independently if not on openbsd, since bundler doesn't seem to get it from the extensions
Diffstat:
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,7 @@
source 'https://rubygems.org/'
+if !RbConfig::CONFIG['arch'].include?('openbsd')
+ gem 'xapian-ruby', '~> 1.2.15'
+end
+
gemspec
diff --git a/ext/mkrf_conf_xapian.rb b/ext/mkrf_conf_xapian.rb
@@ -14,14 +14,15 @@ inst = Gem::DependencyInstaller.new
begin
if !RbConfig::CONFIG['arch'].include?('openbsd')
+ # update version in Gemfile as well
name = "xapian-ruby"
version = "~> 1.2.15"
begin
# try to load gem
- STDERR.puts "xapian: already installed."
gem name, version
+ STDERR.puts "xapian: already installed."
rescue Gem::LoadError
diff --git a/sup.gemspec b/sup.gemspec
@@ -43,7 +43,7 @@ SUP: please note that our old mailing lists have been shut down,
s.extensions = %w[ext/mkrf_conf_xapian.rb]
## remember to update the xapian dependency in
- ## ext/mkrf_conf_xapian.rb.
+ ## ext/mkrf_conf_xapian.rb and Gemfile.
s.add_runtime_dependency "ncursesw", "~> 1.4.0"
s.add_runtime_dependency "rmail-sup", "~> 1.0.1"