diff options
| author |   Peter Volkov <pva@gentoo.org> | 2009-01-31 16:15:06 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2009-01-31 16:15:06 +0000 |
| commit | f6944d3f851931e9c2bd27351d8ab5ca9f0975e4 (patch) | |
| tree | 7f3c1e7e40df94596e56c33844dd5e696489dc20 /net-wireless/madwifi-ng | |
| parent | Clean up old revisions. (diff) | |
| download | gentoo-2-f6944d3f851931e9c2bd27351d8ab5ca9f0975e4.tar.gz gentoo-2-f6944d3f851931e9c2bd27351d8ab5ca9f0975e4.tar.bz2 gentoo-2-f6944d3f851931e9c2bd27351d8ab5ca9f0975e4.zip | |
Fixed build problem with gcc-4.3, bug #256669, thank cilly for report and fix.
(Portage version: 2.2_rc23/cvs/Linux i686)
Diffstat (limited to 'net-wireless/madwifi-ng')
4 files changed, 45 insertions, 6 deletions
diff --git a/net-wireless/madwifi-ng/ChangeLog b/net-wireless/madwifi-ng/ChangeLog index 53e4bf6b584b..35ccae1cf058 100644 --- a/net-wireless/madwifi-ng/ChangeLog +++ b/net-wireless/madwifi-ng/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-wireless/madwifi-ng -# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.64 2008/11/15 16:28:31 pva Exp $ +# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.65 2009/01/31 16:15:06 pva Exp $ + + 31 Jan 2009; Peter Volkov <pva@gentoo.org> + +files/madwifi-ng-0.9.4-request_module-build.patch, + madwifi-ng-0.9.4.ebuild, madwifi-ng-0.9.4-r1.ebuild: + Fixed build problem with gcc-4.3, bug #256669, thank cilly for report and + fix. 15 Nov 2008; Peter Volkov <pva@gentoo.org> madwifi-ng-0.9.4.ebuild, madwifi-ng-0.9.4-r1.ebuild: diff --git a/net-wireless/madwifi-ng/files/madwifi-ng-0.9.4-request_module-build.patch b/net-wireless/madwifi-ng/files/madwifi-ng-0.9.4-request_module-build.patch new file mode 100644 index 000000000000..ad338a3b70e0 --- /dev/null +++ b/net-wireless/madwifi-ng/files/madwifi-ng-0.9.4-request_module-build.patch @@ -0,0 +1,31 @@ +http://bugs.gentoo.org/show_bug.cgi?id=232099 +http://madwifi-project.org/changeset/3880 + +=== modified file 'include/compat.h' +--- include/compat.h 2009-01-31 16:01:16 +0000 ++++ include/compat.h 2009-01-31 16:03:33 +0000 +@@ -175,6 +175,10 @@ + #define DEV_ATH CTL_UNNUMBERED + #endif + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) ++#define request_module(_fmt, _modname) request_module(_modname) ++#endif ++ + #endif /* __KERNEL__ */ + + #endif /* _ATH_COMPAT_H_ */ + +=== modified file 'net80211/ieee80211_linux.c' +--- net80211/ieee80211_linux.c 2009-01-31 16:01:16 +0000 ++++ net80211/ieee80211_linux.c 2009-01-31 16:03:09 +0000 +@@ -335,7 +335,7 @@ + { + #ifdef CONFIG_KMOD + int rv; +- rv = request_module(modname); ++ rv = request_module("%s", modname); + if (rv < 0) + printk(KERN_ERR "failed to automatically load module: %s; " \ + "errno: %d\n", modname, rv); + diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.9.4-r1.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.9.4-r1.ebuild index 6fc7566bec45..2dd24c1192b5 100644 --- a/net-wireless/madwifi-ng/madwifi-ng-0.9.4-r1.ebuild +++ b/net-wireless/madwifi-ng/madwifi-ng-0.9.4-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.4-r1.ebuild,v 1.4 2008/11/15 16:28:31 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.4-r1.ebuild,v 1.5 2009/01/31 16:15:06 pva Exp $ inherit linux-mod @@ -61,6 +61,7 @@ src_unpack() { done epatch "${FILESDIR}/madwifi-dfs-ieee80211-skb-update.patch" kernel_is ge 2 6 27 && epatch "${FILESDIR}/${P}-2.6.27-r3811.patch" + epatch "${FILESDIR}/${P}-request_module-build.patch" } src_install() { diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.9.4.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.9.4.ebuild index a03266f2c9b0..07f6dc96077a 100644 --- a/net-wireless/madwifi-ng/madwifi-ng-0.9.4.ebuild +++ b/net-wireless/madwifi-ng/madwifi-ng-0.9.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.4.ebuild,v 1.9 2008/11/15 16:28:31 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.4.ebuild,v 1.10 2009/01/31 16:15:06 pva Exp $ inherit linux-mod @@ -61,6 +61,7 @@ src_unpack() { done epatch "${FILESDIR}"/madwifi-dfs-ieee80211-skb-update.patch kernel_is ge 2 6 27 && epatch "${FILESDIR}/${P}-2.6.27-r3811.patch" + epatch "${FILESDIR}/${P}-request_module-build.patch" } src_install() { |