From: Florian Fainelli Date: Sun, 5 Mar 2006 14:39:04 +0000 (+0000) Subject: Disable zaptel.h detection on host system, may break compilation when zaptel is set... X-Git-Tag: whiterussian_rc5~100 X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=3ac05e04b3fcb5232e653c8d65876e54c0322d46;p=openwrt%2Fsvn-archive%2Fopenwrt.git Disable zaptel.h detection on host system, may break compilation when zaptel is set up on the host system SVN-Revision: 3308 --- diff --git a/openwrt/package/asterisk/patches/zaptel-no-host-detection.patch b/openwrt/package/asterisk/patches/zaptel-no-host-detection.patch new file mode 100644 index 0000000000..01fbf6f3e5 --- /dev/null +++ b/openwrt/package/asterisk/patches/zaptel-no-host-detection.patch @@ -0,0 +1,28 @@ +diff -urN asterisk-1.0.10/Makefile asterisk-1.0.10.new/Makefile +--- asterisk-1.0.10/Makefile 2006-03-05 15:13:43.799355464 +0100 ++++ asterisk-1.0.10.new/Makefile 2006-03-05 15:25:02.911114784 +0100 +@@ -159,8 +159,8 @@ + #Uncomment this to use the older DSP routines + #CFLAGS+=-DOLD_DSP_ROUTINES + +-CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi) +-CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi) ++#CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi) ++#CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi) + + LIBEDIT=editline/libedit.a + +diff -urN asterisk-1.0.10/res/Makefile asterisk-1.0.10.new/res/Makefile +--- asterisk-1.0.10/res/Makefile 2006-03-05 15:13:43.819352424 +0100 ++++ asterisk-1.0.10.new/res/Makefile 2006-03-05 15:26:12.987461560 +0100 +@@ -20,8 +20,8 @@ + CRYPTO_LIBS=-lssl -lcrypto + + CFLAGS+= +-CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo " -DZAPATA_MOH") +-CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo " -DZAPATA_MOH") ++#CFLAGS+=$(shell [ -f $(STAGING_DIR)/usr/include/linux/zaptel.h ] && echo " -DZAPATA_MOH") ++#CFLAGS+=$(shell [ -f $(STAGING_DIR)/usr/include/zaptel/zaptel.h ] && echo " -DZAPATA_MOH") + # + # Work around buggy RedHat 9.0 + #