[DRE-commits] [ruby-hiredis] 02/05: Refresh use_system_libhiredis.patch

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to branch master
in repository ruby-hiredis.

commit bf05a4035f44daeface5da434aea6a2170e59026
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Fri Apr 4 16:20:38 2014 +0300

    Refresh use_system_libhiredis.patch
---
 debian/patches/use_system_libhiredis.patch | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/debian/patches/use_system_libhiredis.patch b/debian/patches/use_system_libhiredis.patch
index 8419e98..9e68790 100644
--- a/debian/patches/use_system_libhiredis.patch
+++ b/debian/patches/use_system_libhiredis.patch
@@ -6,23 +6,33 @@ Last-Update: 2013-04-10
 Forwarded: no
 --- a/ext/hiredis_ext/extconf.rb
 +++ b/ext/hiredis_ext/extconf.rb
-@@ -2,16 +2,9 @@
+@@ -2,27 +2,14 @@
  
  RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
  
--hiredis_dir = File.expand_path(File.join(File.dirname(__FILE__), %w{.. .. vendor hiredis}))
+-hiredis_dir = File.join(File.dirname(__FILE__), %w{.. .. vendor hiredis})
 -unless File.directory?(hiredis_dir)
 -  STDERR.puts "vendor/hiredis missing, please checkout its submodule..."
 -  exit 1
 -end
-+hiredis_dir = "/usr/include/hiredis"
+-
+ RbConfig::CONFIG['configure_args'] =~ /with-make-prog\=(\w+)/
+ make_program = $1 || ENV['make']
+ unless make_program then
+   make_program = (/mswin/ =~ RUBY_PLATFORM) ? 'nmake' : 'make'
+ end
  
 -# Make sure hiredis is built...
--system("cd #{hiredis_dir} && make static")
+-Dir.chdir(hiredis_dir) do
+-  success = system("#{make_program} static")
+-  raise "Building hiredis failed" if !success
+-end
 -
 -# Statically link to hiredis (mkmf can't do this for us)
- $CFLAGS << " -I#{hiredis_dir}"
+-$CFLAGS << " -I#{hiredis_dir}"
 -$LDFLAGS << " #{hiredis_dir}/libhiredis.a"
++$CFLAGS << " -I/usr/include/hiredis"
 +$LDFLAGS << " -lhiredis"
-+
+ 
+ have_func("rb_thread_fd_select")
  create_makefile('hiredis/ext/hiredis_ext')

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-hiredis.git