UBUNTU: [Debian] Disable SPL/ZFS for cross compiling -- redux

Signed-off-by: Andy Whitcroft <apw@canonical.com>

diff --git a/debian/rules b/debian/rules
index 37a0988e9910760d19d8da8e18a7b9faeb9b22aa..d512868a9d87284f07b65a1b64d1354b801db303 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -40,6 +40,7 @@ do_tools_common=true
 # Don't build tools in a cross compile environment.
 ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
        do_tools=false
+       do_zfs=false
 endif
 
 # Stages -- support both DEB_STAGE=stage1 and DEB_BUILD_PROFILE=bootstrap

diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
index 80056bc0640bbe2223f27b7acddbddc63e958f5f..6c4f2bd96e6d84c84bc1db57466c5f6c2d557b27 100644 (file)
--- a/debian/rules.d/0-common-vars.mk
+++ b/debian/rules.d/0-common-vars.mk
@@ -107,13 +107,6 @@ ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
        CROSS_COMPILE ?= $(DEB_HOST_GNU_TYPE)-
 endif
 
-#
-# The SPL/ZFS config is not cross compile smart yet.
-#
-ifneq ($(CROSS_COMPILE),)
-       do_zfs = false
-endif
-
 abidir         := $(CURDIR)/$(DEBIAN)/abi/$(release)-$(revision)/$(arch)
 prev_abidir    := $(CURDIR)/$(DEBIAN)/abi/$(release)-$(prev_revision)/$(arch)
 commonconfdir  := $(CURDIR)/$(DEBIAN)/config