r282 - in /unstable/madwifi/debian: changelog patches/00list patches/11_mips-compile-flags-fix.dpatch

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

Author: kelmo-guest
Date: Sun Jul 15 00:56:25 2007
New Revision: 282

URL: http://svn.debian.org/wsvn/pkg-madwifi/?sc=1&rev=282
Log:
* Fix compilation on mips32, thanks Aurelien. (Closes: #433158)

Added:
    unstable/madwifi/debian/patches/11_mips-compile-flags-fix.dpatch
Modified:
    unstable/madwifi/debian/changelog
    unstable/madwifi/debian/patches/00list

Modified: unstable/madwifi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/changelog?rev=282&op=diff
==============================================================================
--- unstable/madwifi/debian/changelog (original)
+++ unstable/madwifi/debian/changelog Sun Jul 15 00:56:25 2007
@@ -1,3 +1,10 @@
+madwifi (1:0.9.3-4) UNRELEASED; urgency=low
+
+  * Fix compilation on mips32, thanks Aurelien. (Closes: #433158)
+    [debian/patches/11_mips-compile-flags-fix.dpatch]
+
+ -- Kel Modderman <kel at otaku42.de>  Sun, 15 Jul 2007 10:54:37 +1000
+
 madwifi (1:0.9.3-3) unstable; urgency=low
 
   * Format Homepage fileds. [debian/control]

Modified: unstable/madwifi/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/patches/00list?rev=282&op=diff
==============================================================================
--- unstable/madwifi/debian/patches/00list (original)
+++ unstable/madwifi/debian/patches/00list Sun Jul 15 00:56:25 2007
@@ -2,3 +2,4 @@
 02_secfix-0.9.3-wmmparams-take2
 03_secfix-0.9.3-beacon_interval_range
 10_compat-0.9.3-2.6.22
+11_mips-compile-flags-fix

Added: unstable/madwifi/debian/patches/11_mips-compile-flags-fix.dpatch
URL: http://svn.debian.org/wsvn/pkg-madwifi/unstable/madwifi/debian/patches/11_mips-compile-flags-fix.dpatch?rev=282&op=file
==============================================================================
--- unstable/madwifi/debian/patches/11_mips-compile-flags-fix.dpatch (added)
+++ unstable/madwifi/debian/patches/11_mips-compile-flags-fix.dpatch Sun Jul 15 00:56:25 2007
@@ -1,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## mips-compile-flags-fix.patch by Aurelien Jarno <aurel32 at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: madwifi fails to build on MIPS32 CPU due to a bug in the build system.
+## DP: On those systems, the -mips1 option is passed to GCC, which conflicts
+## DP: with the -mips32 option passed by the kernel build system.
+## DP: 
+## DP: Also the -EL or -EB options are issuing warnings, as they are only
+## DP: available on the other endianess system (-EL is available on mips, -EB
+## DP: on mipsel). The default endianess is sane, there is no need to force it,
+## DP: and anyway the kernel build system already handle that.
+
+ at DPATCH@
+diff -Nrup madwifi-0.9.3/hal/public/mips1-be-elf.inc madwifi-0.9.3-mips/hal/public/mips1-be-elf.inc
+--- madwifi-0.9.3/hal/public/mips1-be-elf.inc	2006-05-27 12:48:16.000000000 +1000
++++ madwifi-0.9.3-mips/hal/public/mips1-be-elf.inc	2007-07-15 10:40:52.000000000 +1000
+@@ -68,5 +68,5 @@ AH_REGOPS_FUNC=1
+ 
+ LDOPTS=	-EB
+ COPTS+=	-DAH_BYTE_ORDER=AH_BIG_ENDIAN
+-COPTS+=	-G 0 -EB -mno-abicalls -fno-pic -mips1 -Wa,--trap \
++COPTS+=	-G 0 -mno-abicalls -fno-pic -Wa,--trap \
+ 	-fno-strict-aliasing -fno-common -fomit-frame-pointer -mlong-calls
+diff -Nrup madwifi-0.9.3/hal/public/mips1-le-elf.inc madwifi-0.9.3-mips/hal/public/mips1-le-elf.inc
+--- madwifi-0.9.3/hal/public/mips1-le-elf.inc	2006-05-27 12:48:16.000000000 +1000
++++ madwifi-0.9.3-mips/hal/public/mips1-le-elf.inc	2007-07-15 10:40:08.000000000 +1000
+@@ -68,5 +68,5 @@ AH_REGOPS_FUNC=1
+ 
+ LDOPTS=	-EL
+ COPTS+=	-DAH_BYTE_ORDER=AH_LITTLE_ENDIAN
+-COPTS+=	-G 0 -EL -mno-abicalls -fno-pic -mips1 -Wa,--trap \
++COPTS+=	-G 0 -mno-abicalls -fno-pic -Wa,--trap \
+ 	-fno-strict-aliasing -fno-common -fomit-frame-pointer -mlong-calls