rework 330-remove_m64_switch patch to be less intrusive, thanks nbd

This commit is contained in:
florian 2009-02-03 14:19:25 +00:00 committed by Jiri Slachta
parent 8912f72b09
commit 3db692d815
2 changed files with 12 additions and 13 deletions

View file

@ -1,13 +0,0 @@
diff -urN zaptel-1.4.9.2/Makefile zaptel-1.4.9.2.new/Makefile
--- zaptel-1.4.9.2/Makefile 2008-02-22 01:31:47.000000000 +0100
+++ zaptel-1.4.9.2.new/Makefile 2009-02-03 14:24:25.000000000 +0100
@@ -135,9 +135,6 @@
ifneq (,$(findstring ppc,$(UNAME_M)))
CFLAGS_PPC:=-fsigned-char
endif
-ifneq (,$(findstring x86_64,$(UNAME_M)))
-CFLAGS_x86_64:=-m64
-endif
CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_x86_64)
KFLAGS=-I$(KINCLUDES) -O6
KFLAGS+=-DMODULE -D__KERNEL__ -DEXPORT_SYMTAB -I$(KSRC)/drivers/net \

View file

@ -0,0 +1,12 @@
diff -urN zaptel-1.4.9.2/Makefile zaptel-1.4.9.2.new/Makefile
--- zaptel-1.4.9.2/Makefile 2008-02-22 01:31:47.000000000 +0100
+++ zaptel-1.4.9.2.new/Makefile 2009-02-03 15:24:16.000000000 +0100
@@ -21,7 +21,7 @@
ARCH:=$(shell uname -m | sed -e s/i.86/i386/)
ifeq ($(DEB_HOST_GNU_TYPE),)
-UNAME_M:=$(shell uname -m)
+UNAME_M:=$(ARCH)
else
UNAME_M:=$(DEB_HOST_GNU_TYPE)
endif