[gnome-build-meta/valentindavid/gnome-os-wip: 1/4] Add qemu-system dependency to libvirt



commit 47aaaa4fbc3094067a384fb2de14c241cbd5d0eb
Author: Valentin David <valentin david codethink co uk>
Date:   Thu Jun 25 17:24:27 2020 +0200

    Add qemu-system dependency to libvirt

 elements/core-deps/libvirt.bst | 24 ++++++++++++++++---
 elements/core-deps/qemu.bst    | 54 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 3 deletions(-)
---
diff --git a/elements/core-deps/libvirt.bst b/elements/core-deps/libvirt.bst
index 74f5479b..7a91283f 100644
--- a/elements/core-deps/libvirt.bst
+++ b/elements/core-deps/libvirt.bst
@@ -1,13 +1,16 @@
 kind: autotools
 sources:
 - kind: tar
-  url: https://libvirt.org/sources/libvirt-4.9.0.tar.xz
+  url: https://libvirt.org/sources/libvirt-6.4.0.tar.xz
 build-depends:
+- core-deps/rpcsvc-proto.bst
 - freedesktop-sdk.bst:components/libxslt.bst
 - freedesktop-sdk.bst:components/python3.bst
+- freedesktop-sdk.bst:components/python3-docutils.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
 - freedesktop-sdk.bst:components/libnl.bst
+- core-deps/qemu.bst
 - core-deps/lvm2.bst
 - core-deps/portablexdr.bst
 - freedesktop-sdk.bst:components/gnutls.bst
@@ -15,6 +18,21 @@ depends:
 - freedesktop-sdk.bst:components/libxml2.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 config:
+  configure-commands:
+  - mkdir build
+  - |
+    cd build
+    %{configure}
+  build-commands:
+  - |
+    cd build
+    %{make}
   install-commands:
-    (>):
-    - mv %{install-root}/var/run %{install-root}
+  - |
+    cd build
+    %{make-install}
+  - mv %{install-root}/var/run %{install-root}
+variables:
+  # --disable-Werror does not work
+  conf-global: --disable-static --host=%{triplet} --build=%{triplet}
+  conf-cmd: ../configure
diff --git a/elements/core-deps/qemu.bst b/elements/core-deps/qemu.bst
new file mode 100644
index 00000000..f7fe8a37
--- /dev/null
+++ b/elements/core-deps/qemu.bst
@@ -0,0 +1,54 @@
+kind: autotools
+
+sources:
+- kind: tar
+  url: https://download.qemu.org/qemu-5.0.0.tar.xz
+
+build-depends:
+- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
+
+depends:
+- sdk/glib.bst
+- freedesktop-sdk.bst:components/libcap.bst
+- freedesktop-sdk.bst:components/pixman.bst
+- freedesktop-sdk.bst:components/python3.bst
+- freedesktop-sdk.bst:bootstrap-import.bst
+
+variables:
+  (?):
+  - arch == "x86_64":
+      targets: --target-list=x86_64-softmmu,i386-softmmu
+  - arch == "i686":
+      targets: --target-list=x86_64-softmmu,i386-softmmu
+  - arch == "aarch64":
+      targets: --target-list=aarch64-softmmu,arm-softmmu
+  - arch == "arm":
+      targets: --target-list=arm-softmmu
+  - arch == "powerpc64le":
+      targets: --target-list=ppc64-softmmu
+
+  conf-local: >-
+    --disable-werror
+    --enable-system
+    --disable-user
+
+  # --exec-prefix --disable-static are not accepted
+  conf-args: >-
+    %{targets}
+    --prefix="%{prefix}"
+    --bindir="%{bindir}"
+    --sbindir="%{sbindir}"
+    --sysconfdir="%{sysconfdir}"
+    --datadir="%{datadir}"
+    --includedir="%{includedir}"
+    --libdir="%{libdir}"
+    --libexecdir="%{libexecdir}"
+    --localstatedir="%{localstatedir}"
+    --sharedstatedir="%{sharedstatedir}"
+    --mandir="%{mandir}"
+    --infodir="%{infodir}"
+    --localstatedir=/
+    --host=%{triplet}
+    --build=%{triplet}
+    %{conf-extra}
+    %{conf-local}


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]