r312 - /unstable/madwifi/debian/patches/02_get-arch-mk-x86.patch

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Thu Jan 31 22:12:10 2008
New Revision: 312

URL: http://svn.debian.org/wsvn/pkg-madwifi/?sc=1&rev=312
Log:
update debian/patches/02_get-arch-mk-x86.patch as per discussion on madwifi-devel

Modified:
    unstable/madwifi/debian/patches/02_get-arch-mk-x86.patch

Modified: unstable/madwifi/debian/patches/02_get-arch-mk-x86.patch
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/patches/02_get-arch-mk-x86.patch?rev=312&op=diff
==============================================================================
--- unstable/madwifi/debian/patches/02_get-arch-mk-x86.patch (original)
+++ unstable/madwifi/debian/patches/02_get-arch-mk-x86.patch Thu Jan 31 22:12:10 2008
@@ -1,17 +1,27 @@
 --- a/scripts/get_arch.mk
 +++ b/scripts/get_arch.mk
-@@ -40,6 +40,14 @@
+@@ -36,6 +36,13 @@
+ $(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
-+ifeq ($(filter-out x86,$(ARCH)),)
-+ifeq (x86_64,$(ARCH-y))
-+ARCH = $(ARCH-y)
-+endif
-+ifeq (i386,$(ARCH-y))
-+ARCH = $(ARCH-y)
-+endif
-+endif
- ifneq ($(ARCH),$(ARCH-y))
- $(error ARCH mismatch: supplied "$(ARCH)", determined "$(ARCH-y)")
- endif
+--- a/ath_hal/ah_target.inc
++++ b/ath_hal/ah_target.inc
+@@ -25,6 +25,8 @@
+ 
+ # Determine the target (i.e. which HAL to use).
+ # The default is $(ARCH)-elf
++TARGET-$(CONFIG_X86) = i386-elf
++TARGET-$(CONFIG_X86_64) = x86_64-elf
+ TARGET-$(CONFIG_CPU_32v4) = armv4-$(ENDIAN)-elf
+ TARGET-$(CONFIG_CPU_MIPS32_R1) = mips1-$(ENDIAN)-elf
+ TARGET-$(CONFIG_CPU_MIPS32_R2) = mips-$(ENDIAN)-elf