[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/1.0.5-2

Guido Günther agx at sigxcpu.org
Fri May 3 14:45:31 UTC 2013


The following commit has been merged in the master branch:
commit b47d7060dd874c684925b4cf79f79765010cc8b5
Author: Guido Günther <agx at sigxcpu.org>
Date:   Fri May 3 06:50:39 2013 +0200

    Disable xen and vbox on all non-linux platforms

diff --git a/debian/rules b/debian/rules
index 407e067..c1fa1f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,16 +7,15 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
-ifneq (,$(findstring $(DEB_HOST_ARCH), i386 amd64))
-  DEB_MAKE_CHECK_TARGET = check
-  WITH_XEN = --with-xen
-  WITH_VBOX = --with-vbox
-else
-  WITH_XEN = --without-xen
-  WITH_VBOX = --without-vbox
-endif
-
 ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
+  ifneq (,$(findstring $(DEB_HOST_ARCH), i386 amd64))
+    DEB_MAKE_CHECK_TARGET = check
+    WITH_XEN = --with-xen
+    WITH_VBOX = --with-vbox
+  else
+    WITH_XEN            = --without-xen
+    WITH_VBOX           = --without-vbox
+  endif
   WITH_STORAGE_LVM    = --with-storage-lvm
   WITH_STORAGE_ISCSI  = --with-storage-iscsi
   WITH_STORAGE_DISK   =	--with-storage-disk
@@ -64,6 +63,8 @@ else
   WITH_INIT_SCRIPT    =	--with-init-script=none
   WITH_AUDIT          = --without-audit
   WITH_DTRACE         = --without-dtrace
+  WITH_XEN            = --without-xen
+  WITH_VBOX           = --without-vbox
 endif
 
 DEB_BUILDDIR := $(CURDIR)/debian/build

-- 
Libvirt Debian packaging



More information about the Pkg-libvirt-commits mailing list