openwrt-xburst/package/madwifi/patches/106-get_arch.patch

--- a/scripts/get_arch.mk
+++ b/scripts/get_arch.mk
@@ -36,11 +36,14 @@ ifeq (,$(ARCH-y))
 $(Cannot determine ARCH)
 endif
 
+# Allow ARCH to be x86
+ifneq (,$(CONFIG_X86))
+ifeq (x86,$(ARCH))
+ARCH-y = $(ARCH)
+endif
+endif
+
 # Don't allow ARCH to be overridden by a different value.
 ifeq (,$(ARCH))
 ARCH = $(ARCH-y)
-else
-ifneq ($(ARCH),$(ARCH-y))
-$(error ARCH mismatch: supplied "$(ARCH)", determined "$(ARCH-y)")
-endif
 endif
madwifi: fix x86_64 compilation git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12574 3c298f89-4303-0410-b956-a3cf2f4a3e73 2008-09-12 22:55:38 +03:00			`--- a/scripts/get_arch.mk`
			`+++ b/scripts/get_arch.mk`
madwifi: remove the get_arch.mk build failure when the 'detected' arch doesn't match the build system's value git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17084 3c298f89-4303-0410-b956-a3cf2f4a3e73 2009-08-02 00:29:10 +03:00			`@@ -36,11 +36,14 @@ ifeq (,$(ARCH-y))`
madwifi: fix x86_64 compilation git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12574 3c298f89-4303-0410-b956-a3cf2f4a3e73 2008-09-12 22:55:38 +03:00			`$(Cannot determine ARCH)`
			`endif`

			`+# Allow ARCH to be x86`
			`+ifneq (,$(CONFIG_X86))`
			`+ifeq (x86,$(ARCH))`
			`+ARCH-y = $(ARCH)`
			`+endif`
			`+endif`
			`+`
			`# Don't allow ARCH to be overridden by a different value.`
			`ifeq (,$(ARCH))`
			`ARCH = $(ARCH-y)`
madwifi: remove the get_arch.mk build failure when the 'detected' arch doesn't match the build system's value git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17084 3c298f89-4303-0410-b956-a3cf2f4a3e73 2009-08-02 00:29:10 +03:00			`-else`
			`-ifneq ($(ARCH),$(ARCH-y))`
			`-$(error ARCH mismatch: supplied "$(ARCH)", determined "$(ARCH-y)")`
			`-endif`
			`endif`