From f6703eab857a1e39f0437649d154632226a29892 Mon Sep 17 00:00:00 2001 From: Christoph Mende Date: Sat, 19 Jan 2013 21:21:08 +0000 Subject: Fix compilation with Linux 3.7 (bug #447244) (Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 84F20B43) --- net-wireless/ndiswrapper/ChangeLog | 7 +++++-- net-wireless/ndiswrapper/ndiswrapper-1.58_rc1.ebuild | 15 +++++++++++---- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/net-wireless/ndiswrapper/ChangeLog b/net-wireless/ndiswrapper/ChangeLog index bfa541d95cb8..ea301496b666 100644 --- a/net-wireless/ndiswrapper/ChangeLog +++ b/net-wireless/ndiswrapper/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-wireless/ndiswrapper -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.125 2012/11/18 11:22:42 pacho Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.126 2013/01/19 21:21:08 angelos Exp $ + + 19 Jan 2013; ndiswrapper-1.58_rc1.ebuild: + Fix compilation with Linux 3.7 (bug #447244) 18 Nov 2012; Pacho Ramos metadata.xml: Drop mobile herd as talked in gentoo-dev ML diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.58_rc1.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.58_rc1.ebuild index f970f4c1ee9e..fcad83a47cbf 100644 --- a/net-wireless/ndiswrapper/ndiswrapper-1.58_rc1.ebuild +++ b/net-wireless/ndiswrapper/ndiswrapper-1.58_rc1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.58_rc1.ebuild,v 1.2 2012/05/22 15:54:54 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.58_rc1.ebuild,v 1.3 2013/01/19 21:21:08 angelos Exp $ EAPI=4 inherit base linux-mod toolchain-funcs @@ -33,12 +33,19 @@ pkg_pretend() { linux-mod_pkg_setup } +src_prepare() { + base_src_prepare + + # Linux 3.7 fix by Philip Müller + sed -i "s|/include/linux/version.h|/include/generated/uapi/linux/version.h|g" driver/Makefile +} + src_compile() { - local params + local params="WRAP_WQ=1" # Enable verbose debugging information if use debug; then - params="DEBUG=3" + params="${params} DEBUG=3" use usb && params="${params} USB_DEBUG=1" fi -- cgit v1.2.3-65-gdbad