[patch] Handle KBUILD_OUTPUT in ndiswrapper Makefile

fix-ndiswrapper (text/plain), 4.19 KB, created by BlaisorBlade on 2005-10-13 17:49:42 UTC

Index: usr/portage/net-wireless/ndiswrapper/files/ndiswrapper-1.2-fix-makefile-kobj.patch
===================================================================
--- /dev/null
+++ usr/portage/net-wireless/ndiswrapper/files/ndiswrapper-1.2-fix-makefile-kobj.patch
@@ -0,0 +1,70 @@
+Index: ndiswrapper-1.2/driver/Makefile
+===================================================================
+--- ndiswrapper-1.2.orig/driver/Makefile
++++ ndiswrapper-1.2/driver/Makefile
+@@ -8,6 +8,10 @@ DISTFILES=divdi3.c hal.c iw_ndis.c iw_nd
+ 
+ KVERS ?= $(shell uname -r)
+ KSRC  ?= /lib/modules/$(KVERS)/build
++#Try to guess
++KOBJ  ?= $(KBUILD_OUTPUT)
++#Fallback
++KOBJ  ?= $(KSRC)
+ 
+ KPSUB := $(shell echo $(KVERS) |  sed -e 's/\([^\.]*\)\.\([^\.]*\)\..*/\1\2/')
+ 
+@@ -16,11 +20,11 @@ INST_DIR := $(DESTDIR)/lib/modules/$(KVE
+ 
+ SRC_DIR=$(shell pwd)
+ 
+--include $(KSRC)/.config
++-include $(KOBJ)/.config
+ 
+-CFLAGS += $(shell [ -f $(KSRC)/include/linux/modversions.h ] && \
++CFLAGS += $(shell [ -f $(KOBJ)/include/linux/modversions.h ] && \
+ 		  echo -DEXPORT_SYMTAB -DMODVERSIONS \
+-		  -include $(KSRC)/include/linux/modversions.h)
++		  -include $(KOBJ)/include/linux/modversions.h)
+ 
+ ifdef DEBUG
+ CFLAGS += -DDEBUG=$(DEBUG) -g -DDEBUG_TIMER 
+@@ -152,10 +156,11 @@ gen_exports: ndis_exports.h hal_exports.
+ 			 misc_funcs_exports.h usb_exports.h wrapper_exports.h
+ 
+ prereq_check:
+-	@ if [ ! -f $(KSRC)/include/linux/version.h ]; then \
+-		echo "Can't find kernel sources in $(KSRC);"; \
++	@ if [ ! -f $(KOBJ)/include/linux/version.h ]; then \
++		echo "Can't find compiled kernel sources in $(KOBJ);"; \
+ 		echo "  give the path to kernel sources with KSRC=<path>\
+-		       argument to make";\
++		       argument to make. " \
++		echo "If using KBUILD_OUTPUT, pass the used value in environment"; \
+ 		exit 1;\
+ 	  fi
+ 
+@@ -184,8 +189,12 @@ obj-m := ndiswrapper.o 
+ 
+ ndiswrapper-objs := $(OBJS)
+ 
++KBUILD_OUT_OPT=
++ifneq ($(KOBJ),)
++KBUILD_OUT_OPT="O=$(KOBJ)"
++endif
+ default:
+-	$(MAKE) -C $(KSRC) SUBDIRS=$(SRC_DIR) \
++	$(MAKE) $(KBUILD_OUT_OPT) -C $(KSRC) SUBDIRS=$(SRC_DIR) \
+ 		NDISWRAPPER_VERSION=$(NDISWRAPPER_VERSION) \
+ 		EXTRA_VERSION=$(EXTRA_VERSION) modules
+ 
+@@ -193,8 +202,8 @@ endif
+ 
+ stack_check:
+ 	  @ if [ "x$(CONFIG_X86_64)" = "x" -a $(KPSUB) -eq 26 ]; then \
+-		   if grep -q CONFIG_4KSTACKS $(KSRC)/.config; then \
+-			  if grep -q "CONFIG_4KSTACKS=y" $(KSRC)/.config; then \
++		   if grep -q CONFIG_4KSTACKS $(KOBJ)/.config; then \
++			  if grep -q "CONFIG_4KSTACKS=y" $(KOBJ)/.config; then \
+ 				echo; echo; \
+ 			  	echo "*** WARNING: "\
+ 					 "Kernel is compiled with 4K stack size option"\
Index: usr/portage/net-wireless/ndiswrapper/ndiswrapper-1.2.ebuild
===================================================================
--- usr.orig/portage/net-wireless/ndiswrapper/ndiswrapper-1.2.ebuild
+++ usr/portage/net-wireless/ndiswrapper/ndiswrapper-1.2.ebuild
@@ -28,6 +28,7 @@ src_unpack() {
 
 	cd ${S}
 	epatch ${FILESDIR}/${P}-suspend2.patch || die "suspend2 patch failed"
+	epatch ${FILESDIR}/${P}-fix-makefile-kobj.patch || die "kbuild output patch failed"
 
 	einfo "The only kernels that will work are gentoo-sources, vanilla-sources, and suspend2-sources."
 	einfo "No other kernels are supported. Kernels like the mm kernels will NOT work."
Index: usr/portage/net-wireless/ndiswrapper/Manifest
===================================================================
--- usr.orig/portage/net-wireless/ndiswrapper/Manifest
+++ usr/portage/net-wireless/ndiswrapper/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 2f23f7a03663f91b912ee253c14ebbf5 ndiswrapper-1.2.ebuild 2617
 MD5 8da029b75194bf52d7bda5550cb43a60 ChangeLog 6414
 MD5 82add84ad0d2f8b69058e245396e3e89 metadata.xml 507
-MD5 cac3ca22dc7de36f7b39637624d8a8c8 ndiswrapper-1.2.ebuild 2532
 MD5 fd2f66ff609bafcd303be1db969e9185 files/digest-ndiswrapper-1.2 67
+MD5 9385e7c4f999a2a7927fc3b13f0dd4a0 files/ndiswrapper-1.2-fix-makefile-kobj.patch 2321
 MD5 9cf5a13dc78b9840d419f0656d1dd920 files/ndiswrapper-1.2-suspend2.patch 553
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDDrKnBtvusYtCZMsRAqN5AJ47kJJgszSS3RzPKRbMsA99WLcEQwCePtPr
-7osL1KU0aoUJy0pRggq0kEw=
-=X/hC
------END PGP SIGNATURE-----