From 7f9e41d6599ce0e33aa56c42f83c5f58c5c46cd4 Mon Sep 17 00:00:00 2001
From: Sebastian Szary <sebastian@szary.org>
Date: Fri, 12 Feb 2016 01:06:40 +0100
Subject: [PATCH] Resolves Bug 1161338 - ruby-libvirt: FTBS on Mac OS
 (ruby-libvirt 0.6.0)

---
 Rakefile               | 4 ++++
 ext/libvirt/extconf.rb | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index 331cd30..4e56ec5 100644
--- a/Rakefile
+++ b/Rakefile
@@ -148,6 +148,10 @@ SPEC = Gem::Specification.new do |s|
     s.license = "LGPLv2"
 end
 
+if RUBY_PLATFORM =~ /universal.x86_64-darwin/
+   ENV['ARCHFLAGS'] = '-arch x86_64'
+end
+
 Gem::PackageTask.new(SPEC) do |pkg|
     pkg.need_tar = true
     pkg.need_zip = true
diff --git a/ext/libvirt/extconf.rb b/ext/libvirt/extconf.rb
index d5f4d74..8cc33a6 100644
--- a/ext/libvirt/extconf.rb
+++ b/ext/libvirt/extconf.rb
@@ -1,5 +1,7 @@
 require 'mkmf'
 
+$defs.push("-DHAVE_VIRDOMAINQEMUMONITORCOMMAND")
+
 RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
 RbConfig::MAKEFILE_CONFIG['CCDLFLAGS'] = ENV['CFLAGS'] if ENV['CFLAGS']
 RbConfig::MAKEFILE_CONFIG['EXTDLDFLAGS'] = ENV['CFLAGS'] if ENV['CFLAGS']
@@ -479,7 +481,7 @@ def have_const(const, headers = nil, opt = "", &b)
 libvirt_consts.each { |c| have_const(c, ["libvirt/libvirt.h"]) }
 virterror_consts.each { |c| have_const(c, ["libvirt/virterror.h"]) }
 if find_header("libvirt/libvirt-qemu.h")
-  have_library("virt-qemu", "virDomainQemuMonitorCommand")
+  have_library("virt-qemu", "virDomainQemuMonitorCommand", "libvirt/libvirt-qemu.h")
   libvirt_qemu_funcs.each { |f| have_func(f, "libvirt/libvirt-qemu.h") }
   libvirt_qemu_consts.each { |c| have_const(c, ["libvirt/libvirt-qemu.h"]) }
 end