1 files changed, 41 insertions, 47 deletions

diff --git a/recipes-extended/libvirt/libvirt/libvirt_api_xml_path.patch b/recipes-extended/libvirt/libvirt/libvirt_api_xml_path.patch
index 0aa3bde2..16321db5 100644
--- a/recipes-extended/libvirt/libvirt/libvirt_api_xml_path.patch
+++ b/recipes-extended/libvirt/libvirt/libvirt_api_xml_path.patch
@@ -14,41 +14,26 @@ Signed-off-by: Martin Kletzander <mkletzan redhat com>
  setup.py |   25 ++++++++++++++++++++++---
  1 file changed, 22 insertions(+), 3 deletions(-)
 
-Index: libvirt-python-1.2.1/setup.py
+Index: libvirt-python-1.2.4/setup.py
 ===================================================================
---- libvirt-python-1.2.1.orig/setup.py
-+++ libvirt-python-1.2.1/setup.py
-@@ -30,18 +30,19 @@
- if pkgcfg is None:
-     raise Exception("pkg-config binary is required to compile libvirt-python")
+--- libvirt-python-1.2.4.orig/setup.py
++++ libvirt-python-1.2.4/setup.py
+@@ -40,13 +40,7 @@
+            "libvirt"])
  
--spawn([pkgcfg,
--       "--print-errors",
--       "--atleast-version=%s" % MIN_LIBVIRT,
--       "libvirt"])
-+# spawn([pkgcfg,
-+#        "--print-errors",
-+#        "--atleast-version=%s" % MIN_LIBVIRT,
-+#        "libvirt"])
- 
- have_libvirt_lxc=True
--try:
--    spawn([pkgcfg,
--           "--atleast-version=%s" % MIN_LIBVIRT_LXC,
--         "libvirt"])
--except DistutilsExecError:
--    have_libvirt_lxc=False
-+# try:
-+#     spawn([pkgcfg,
-+#            "--atleast-version=%s" % MIN_LIBVIRT_LXC,
-+#          "libvirt"])
-+# except DistutilsExecError:
-+#     have_libvirt_lxc=False
-+have_libvirt_lxc=True
+ def have_libvirt_lxc():
+-    try:
+-        spawn([get_pkgcfg(),
+-               "--atleast-version=%s" % MIN_LIBVIRT_LXC,
+-             "libvirt"])
+-        return True
+-    except DistutilsExecError:
+-        return False
++    return True
  
  def get_pkgconfig_data(args, mod, required=True):
      """Run pkg-config to and return content associated with it"""
-@@ -63,7 +64,17 @@
+@@ -68,7 +62,17 @@
      """Check with pkg-config that libvirt is present and extract
      the API XML file paths we need from it"""
  
@@ -67,23 +52,32 @@ Index: libvirt-python-1.2.1/setup.py
  
      offset = libvirt_api.index("-api.xml")
      libvirt_qemu_api = libvirt_api[0:offset] + "-qemu-api.xml"
-@@ -73,8 +84,17 @@
- 
-     return (libvirt_api, libvirt_qemu_api, libvirt_lxc_api)
+@@ -88,8 +92,17 @@
  
--ldflags = get_pkgconfig_data(["--libs-only-L"], "libvirt", False)
--cflags = get_pkgconfig_data(["--cflags"], "libvirt", False)
-+libvirt_cflags = os.getenv("LIBVIRT_CFLAGS")
-+if libvirt_cflags:
-+    cflags = libvirt_cflags
-+else:
-+    cflags = get_pkgconfig_data(["--cflags"], "libvirt", False)
+     c_modules = []
+     py_modules = []
+-    ldflags = get_pkgconfig_data(["--libs-only-L"], "libvirt", False)
+-    cflags = get_pkgconfig_data(["--cflags"], "libvirt", False)
++    libvirt_cflags = os.getenv("LIBVIRT_CFLAGS")
++    if libvirt_cflags:
++        cflags = libvirt_cflags
++    else:
++        cflags = get_pkgconfig_data(["--cflags"], "libvirt", False)
 +
-+libvirt_libs = os.getenv("LIBVIRT_LIBS")
-+if libvirt_libs:
-+    ldflags = libvirt_libs
-+else:
-+    ldflags = get_pkgconfig_data(["--libs-only-L"], "libvirt", False)
++    libvirt_libs = os.getenv("LIBVIRT_LIBS")
++    if libvirt_libs:
++        ldflags = libvirt_libs
++    else:
++        ldflags = get_pkgconfig_data(["--libs-only-L"], "libvirt", False)
+ 
+     module = Extension('libvirtmod',
+                        sources = ['libvirt-override.c', 'build/libvirt.c', 'typewrappers.c', 'libvirt-utils.c'],
+@@ -138,7 +151,7 @@
+ class my_build(build):
+ 
+     def run(self):
+-        check_minimum_libvirt_version()
++#       check_minimum_libvirt_version()
+         apis = get_api_xml_files()
  
- c_modules = []
- py_modules = []
+         self.spawn([sys.executable, "generator.py", "libvirt", apis[0]])