From f82d7691927f6074860bfc77a3ff9aa86531b07a Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Tue, 3 Feb 2009 14:19:25 +0000 Subject: [PATCH] [package] rework 330-remove_m64_switch patch to be less intrusive, thanks nbd SVN-Revision: 14389 --- .../patches/330-remove_m64_switch.patch | 13 ------------- libs/zaptel-1.4.x/patches/330-uname_m.patch | 12 ++++++++++++ 2 files changed, 12 insertions(+), 13 deletions(-) delete mode 100644 libs/zaptel-1.4.x/patches/330-remove_m64_switch.patch create mode 100644 libs/zaptel-1.4.x/patches/330-uname_m.patch diff --git a/libs/zaptel-1.4.x/patches/330-remove_m64_switch.patch b/libs/zaptel-1.4.x/patches/330-remove_m64_switch.patch deleted file mode 100644 index b2c5b2468b..0000000000 --- a/libs/zaptel-1.4.x/patches/330-remove_m64_switch.patch +++ /dev/null @@ -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 \ diff --git a/libs/zaptel-1.4.x/patches/330-uname_m.patch b/libs/zaptel-1.4.x/patches/330-uname_m.patch new file mode 100644 index 0000000000..cf2593492f --- /dev/null +++ b/libs/zaptel-1.4.x/patches/330-uname_m.patch @@ -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 -- 2.30.2