代码拉取完成,页面将自动刷新
From 3339e1d7eb7a7f4e14b1c2be7597af60384b123c Mon Sep 17 00:00:00 2001
From: Pavel Valena <pvalena@redhat.com>
Date: Wed, 9 May 2018 15:50:22 +0200
Subject: [PATCH] Build against system hiredis.
---
ext/hiredis_ext/extconf.rb | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/ext/hiredis_ext/extconf.rb b/ext/hiredis_ext/extconf.rb
index da39eb5..4bdfc00 100644
--- a/ext/hiredis_ext/extconf.rb
+++ b/ext/hiredis_ext/extconf.rb
@@ -8,12 +8,6 @@ RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
end
RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
-
-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
RbConfig::CONFIG['configure_args'] =~ /with-make-prog\=(\w+)/
make_program = $1 || ENV['make']
@@ -27,15 +26,7 @@ end
end
if build_hiredis
- # Make sure hiredis is built...
- 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}"
- $LDFLAGS << " #{hiredis_dir}/libhiredis.a"
+ pkg_config 'hiredis'
have_func("rb_thread_fd_select")
create_makefile('hiredis/ext/hiredis_ext')
--
2.13.6
此处可能存在不合适展示的内容,页面不予展示。您可通过相关编辑功能自查并修改。
如您确认内容无涉及 不当用语 / 纯广告导流 / 暴力 / 低俗色情 / 侵权 / 盗版 / 虚假 / 无价值内容或违法国家有关法律法规的内容,可点击提交进行申诉,我们将尽快为您处理。