From b4cdf3997cc76501554246d683dd635bc5a3f019 Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Mon, 11 Sep 2006 08:32:18 +0000 Subject: [PATCH] disable too aggressive optimizations in order to try to get the newer version running again --- asterisk/asterisk.patch | 93 +++++++++++++++++++++++++++-------------- asterisk/asterisk.spec | 2 +- 2 files changed, 63 insertions(+), 32 deletions(-) diff --git a/asterisk/asterisk.patch b/asterisk/asterisk.patch index 6ab8f9537c..985953e6fb 100644 --- a/asterisk/asterisk.patch +++ b/asterisk/asterisk.patch @@ -1,6 +1,23 @@ Index: Makefile --- Makefile.orig 2006-09-06 22:09:10 +0200 -+++ Makefile 2006-09-09 19:28:53 +0200 ++++ Makefile 2006-09-11 10:26:50 +0200 +@@ -47,14 +47,14 @@ + #K6OPT = -DK6OPT + + #Tell gcc to optimize the code +-OPTIMIZE+=-O6 ++#OPTIMIZE+=-O6 + endif + + #Overwite config files on "make samples" + OVERWRITE=y + + #Include debug and macro symbols in the executables (-g) and profiling info (-pg) +-DEBUG=-g3 #-pg ++#DEBUG=-g3 #-pg + + #Set NOCRYPTO to yes if you do not want to have crypto support or + #dependencies @@ -110,35 +110,19 @@ # Don't use together with -DBUSYDETECT_TONEONLY BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE @@ -70,7 +87,7 @@ Index: Makefile ifneq ($(PROC),ultrasparc) ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) endif -@@ -252,29 +236,8 @@ +@@ -252,29 +236,9 @@ endif ifeq ($(OSARCH),FreeBSD) @@ -80,6 +97,7 @@ Index: Makefile - ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/spandsp),) - ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp - endif ++ CFLAGS+=-pthread + LIBS+=-pthread MPG123TARG=freebsd - @@ -101,7 +119,7 @@ Index: Makefile endif # FreeBSD ifeq ($(OSARCH),NetBSD) -@@ -289,7 +252,7 @@ +@@ -289,7 +253,7 @@ ifeq ($(OSARCH),SunOS) ASTCFLAGS+=-Wcast-align -DSOLARIS @@ -110,9 +128,22 @@ Index: Makefile ifeq ($(OSCPU),sun4u) OPTIMIZE+=-mcpu=v9 -mcpu=ultrasparc endif +@@ -341,9 +305,9 @@ + ASTCFLAGS+= $(MALLOC_DEBUG) + ASTCFLAGS+= $(BUSYDETECT) + ASTCFLAGS+= $(OPTIONS) +-ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize) +-ASTCFLAGS+= -fomit-frame-pointer +-endif ++#ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize) ++#ASTCFLAGS+= -fomit-frame-pointer ++#endif + SUBDIRS=res channels pbx apps codecs formats agi cdr funcs utils stdtime + + OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \ Index: agi/Makefile --- agi/Makefile.orig 2006-03-28 22:22:05 +0200 -+++ agi/Makefile 2006-09-09 19:28:53 +0200 ++++ agi/Makefile 2006-09-11 10:25:27 +0200 @@ -20,9 +20,7 @@ LIBS=-lsocket -lnsl ../strcompat.o endif @@ -126,7 +157,7 @@ Index: agi/Makefile Index: app_conference/Makefile --- app_conference/Makefile.orig 2005-10-27 19:53:35 +0200 -+++ app_conference/Makefile 2006-09-09 19:28:53 +0200 ++++ app_conference/Makefile 2006-09-11 10:25:27 +0200 @@ -20,10 +20,10 @@ INSTALL_PREFIX := /opt/horizon INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/lib/asterisk/modules @@ -186,7 +217,7 @@ Index: app_conference/Makefile # cp conf.conf /etc/asterisk/ Index: app_conference/conference.c --- app_conference/conference.c.orig 2005-10-27 19:53:35 +0200 -+++ app_conference/conference.c 2006-09-09 19:28:53 +0200 ++++ app_conference/conference.c 2006-09-11 10:25:27 +0200 @@ -568,7 +568,6 @@ conf->memberlist = NULL ; @@ -215,7 +246,7 @@ Index: app_conference/conference.c Index: apps/Makefile --- apps/Makefile.orig 2006-04-30 15:38:22 +0200 -+++ apps/Makefile 2006-09-09 19:28:53 +0200 ++++ apps/Makefile 2006-09-11 10:25:27 +0200 @@ -54,16 +54,11 @@ APPS+=app_osplookup.so endif @@ -239,7 +270,7 @@ Index: apps/Makefile CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols Index: asterisk-addons-1.2.4/Makefile --- asterisk-addons-1.2.4/Makefile.orig 2005-12-02 00:14:28 +0100 -+++ asterisk-addons-1.2.4/Makefile 2006-09-09 19:28:53 +0200 ++++ asterisk-addons-1.2.4/Makefile 2006-09-11 10:25:27 +0200 @@ -27,17 +27,9 @@ # # MySQL stuff... Autoconf anyone?? @@ -263,7 +294,7 @@ Index: asterisk-addons-1.2.4/Makefile Index: asterisk.c --- asterisk.c.orig 2006-08-22 00:34:26 +0200 -+++ asterisk.c 2006-09-09 19:28:53 +0200 ++++ asterisk.c 2006-09-11 10:25:27 +0200 @@ -1902,9 +1902,9 @@ } else if (!strcasecmp(v->name, "astspooldir")) { ast_copy_string(ast_config_AST_SPOOL_DIR, v->value, sizeof(ast_config_AST_SPOOL_DIR)); @@ -277,7 +308,7 @@ Index: asterisk.c ast_copy_string(ast_config_AST_LOG_DIR, v->value, sizeof(ast_config_AST_LOG_DIR)); Index: build_tools/make_defaults_h --- build_tools/make_defaults_h.orig 2005-06-20 19:26:08 +0200 -+++ build_tools/make_defaults_h 2006-09-09 19:28:53 +0200 ++++ build_tools/make_defaults_h 2006-09-11 10:25:27 +0200 @@ -14,7 +14,7 @@ #define AST_LOG_DIR "${INSTALL_PATH}${ASTLOGDIR}" #define AST_AGI_DIR "${INSTALL_PATH}${AGI_DIR}" @@ -289,7 +320,7 @@ Index: build_tools/make_defaults_h #define AST_CONFIG_FILE "${INSTALL_PATH}${ASTCONFPATH}" Index: cdr/Makefile --- cdr/Makefile.orig 2006-04-30 16:27:56 +0200 -+++ cdr/Makefile 2006-09-09 19:28:53 +0200 ++++ cdr/Makefile 2006-09-11 10:25:27 +0200 @@ -20,10 +20,8 @@ CFLAGS+=-fPIC endif @@ -305,7 +336,7 @@ Index: cdr/Makefile #This works for even old (2.96) versions of gcc and provides a small boost either way. Index: channels/Makefile --- channels/Makefile.orig 2006-08-17 23:57:19 +0200 -+++ channels/Makefile 2006-09-09 19:28:53 +0200 ++++ channels/Makefile 2006-09-11 10:25:27 +0200 @@ -21,9 +21,7 @@ #CHANNEL_LIBS+=chan_modem.so chan_modem_aopen.so chan_modem_bestdata.so endif @@ -319,7 +350,7 @@ Index: channels/Makefile PTLIB=-lpt_OpenBSD_x86_r Index: channels/chan_h323.c --- channels/chan_h323.c.orig 2006-08-30 20:59:44 +0200 -+++ channels/chan_h323.c 2006-09-09 19:28:53 +0200 ++++ channels/chan_h323.c 2006-09-11 10:25:27 +0200 @@ -31,6 +31,7 @@ * \ingroup channel_drivers */ @@ -330,7 +361,7 @@ Index: channels/chan_h323.c #include Index: channels/chan_iax2.c --- channels/chan_iax2.c.orig 2006-09-06 17:55:20 +0200 -+++ channels/chan_iax2.c 2006-09-09 19:28:53 +0200 ++++ channels/chan_iax2.c 2006-09-11 10:25:27 +0200 @@ -2606,7 +2606,7 @@ struct ast_variable *var; struct ast_variable *tmp; @@ -355,7 +386,7 @@ Index: channels/chan_iax2.c } else if (!strcasecmp(tmp->name, "port")) { Index: channels/chan_sip.c --- channels/chan_sip.c.orig 2006-09-04 17:46:07 +0200 -+++ channels/chan_sip.c 2006-09-09 19:28:53 +0200 ++++ channels/chan_sip.c 2006-09-11 10:25:27 +0200 @@ -12252,7 +12252,7 @@ int obproxyfound=0; int found=0; @@ -380,7 +411,7 @@ Index: channels/chan_sip.c } else if (realtime && !strcasecmp(v->name, "name")) Index: channels/chan_skinny.c --- channels/chan_skinny.c.orig 2006-08-30 20:59:44 +0200 -+++ channels/chan_skinny.c 2006-09-09 19:28:53 +0200 ++++ channels/chan_skinny.c 2006-09-11 10:25:27 +0200 @@ -99,7 +99,7 @@ #define htolel(x) (x) #define htoles(x) (x) @@ -392,7 +423,7 @@ Index: channels/chan_skinny.c (((x) & 0x00ff) << 8)) Index: codecs/Makefile --- codecs/Makefile.orig 2005-11-29 19:24:39 +0100 -+++ codecs/Makefile 2006-09-09 19:28:53 +0200 ++++ codecs/Makefile 2006-09-11 10:25:27 +0200 @@ -28,45 +28,16 @@ LIBG723B=g723.1b/libg723b.a endif @@ -445,7 +476,7 @@ Index: codecs/Makefile codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \ Index: codecs/gsm/src/short_term.c --- codecs/gsm/src/short_term.c.orig 2005-11-29 19:24:39 +0100 -+++ codecs/gsm/src/short_term.c 2006-09-09 19:28:53 +0200 ++++ codecs/gsm/src/short_term.c 2006-09-11 10:25:27 +0200 @@ -373,7 +373,6 @@ word * LARpp_j_1 = S->LARpp[ S->j ^= 1 ]; @@ -456,7 +487,7 @@ Index: codecs/gsm/src/short_term.c # define FILTER (* (S->fast \ Index: codecs/lpc10/analys.c --- codecs/lpc10/analys.c.orig 2005-11-29 19:24:39 +0100 -+++ codecs/lpc10/analys.c 2006-09-09 19:28:53 +0200 ++++ codecs/lpc10/analys.c 2006-09-11 10:25:27 +0200 @@ -32,7 +32,7 @@ #include "f2c.h" @@ -468,7 +499,7 @@ Index: codecs/lpc10/analys.c /*:ref: preemp_ 14 5 6 6 4 6 6 */ Index: formats/Makefile --- formats/Makefile.orig 2005-11-29 19:24:39 +0100 -+++ formats/Makefile 2006-09-09 19:28:53 +0200 ++++ formats/Makefile 2006-09-11 10:25:27 +0200 @@ -29,9 +29,7 @@ FORMAT_LIBS+=format_ogg_vorbis.so endif @@ -482,7 +513,7 @@ Index: formats/Makefile Index: formats/msgsm.h --- formats/msgsm.h.orig 2005-11-29 19:24:39 +0100 -+++ formats/msgsm.h 2006-09-09 19:28:53 +0200 ++++ formats/msgsm.h 2006-09-11 10:25:27 +0200 @@ -562,6 +562,7 @@ xmc[46] = sr & 0x7; sr >>= 3; xmc[47] = sr & 0x7; sr >>= 3; @@ -493,7 +524,7 @@ Index: formats/msgsm.h xmc[50] = sr & 0x7; sr >>= 3; Index: frame.c --- frame.c.orig 2006-07-31 06:06:16 +0200 -+++ frame.c 2006-09-09 19:28:53 +0200 ++++ frame.c 2006-09-11 10:25:27 +0200 @@ -1055,7 +1055,7 @@ { switch(buf & TYPE_MASK) { @@ -505,7 +536,7 @@ Index: frame.c return 4; Index: funcs/Makefile --- funcs/Makefile.orig 2005-11-29 19:24:39 +0100 -+++ funcs/Makefile 2006-09-09 19:28:53 +0200 ++++ funcs/Makefile 2006-09-11 10:25:27 +0200 @@ -40,9 +40,7 @@ CFLAGS+=-fPIC endif @@ -519,7 +550,7 @@ Index: funcs/Makefile Index: funcs/func_strings.c --- funcs/func_strings.c.orig 2006-03-21 18:45:56 +0100 -+++ funcs/func_strings.c 2006-09-09 19:30:57 +0200 ++++ funcs/func_strings.c 2006-09-11 10:25:27 +0200 @@ -169,7 +169,7 @@ epochi = tv.tv_sec; } @@ -531,7 +562,7 @@ Index: funcs/func_strings.c format = "%c"; Index: pbx/Makefile --- pbx/Makefile.orig 2005-11-29 19:24:39 +0100 -+++ pbx/Makefile 2006-09-09 19:28:53 +0200 ++++ pbx/Makefile 2006-09-11 10:25:27 +0200 @@ -14,9 +14,7 @@ PBX_LIBS=pbx_config.so pbx_spool.so pbx_dundi.so pbx_loopback.so pbx_realtime.so \ pbx_ael.so @@ -545,7 +576,7 @@ Index: pbx/Makefile #PBX_LIBS+=$(shell $(CROSS_COMPILE_BIN)gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so") Index: res/Makefile --- res/Makefile.orig 2005-11-29 19:24:39 +0100 -+++ res/Makefile 2006-09-09 19:28:53 +0200 ++++ res/Makefile 2006-09-11 10:25:27 +0200 @@ -36,10 +36,8 @@ endif endif @@ -561,7 +592,7 @@ Index: res/Makefile CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols Index: res/res_features.c --- res/res_features.c.orig 2006-08-02 01:07:06 +0200 -+++ res/res_features.c 2006-09-09 19:28:53 +0200 ++++ res/res_features.c 2006-09-11 10:25:27 +0200 @@ -505,13 +505,13 @@ if (touch_monitor) { len = strlen(touch_monitor) + 50; @@ -580,7 +611,7 @@ Index: res/res_features.c for( x = 0; x < strlen(args); x++) Index: rtp.c --- rtp.c.orig 2006-09-01 19:35:06 +0200 -+++ rtp.c 2006-09-09 19:28:53 +0200 ++++ rtp.c 2006-09-11 10:25:27 +0200 @@ -962,8 +962,10 @@ rtp->us.sin_port = htons(x); rtp->us.sin_addr = addr; @@ -595,7 +626,7 @@ Index: rtp.c (!rtp->rtcp || !bind(rtp->rtcp->s, (struct sockaddr *)&rtp->rtcp->us, sizeof(rtp->rtcp->us)))) Index: say.c --- say.c.orig 2005-11-29 19:24:39 +0100 -+++ say.c 2006-09-09 19:28:53 +0200 ++++ say.c 2006-09-11 10:25:27 +0200 @@ -3133,7 +3133,7 @@ time_t beg_today; @@ -787,7 +818,7 @@ Index: say.c beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); Index: utils.c --- utils.c.orig 2006-07-12 15:54:10 +0200 -+++ utils.c 2006-09-09 19:28:53 +0200 ++++ utils.c 2006-09-11 10:25:27 +0200 @@ -58,7 +58,10 @@ static char base64[64]; static char b2a[256]; @@ -802,7 +833,7 @@ Index: utils.c #define ERANGE 34 Index: utils/Makefile --- utils/Makefile.orig 2005-11-29 19:24:39 +0100 -+++ utils/Makefile 2006-09-09 19:28:53 +0200 ++++ utils/Makefile 2006-09-11 10:25:27 +0200 @@ -16,17 +16,15 @@ # CFLAGS+=-DNO_AST_MM diff --git a/asterisk/asterisk.spec b/asterisk/asterisk.spec index 4277ae8bbc..ed7d397358 100644 --- a/asterisk/asterisk.spec +++ b/asterisk/asterisk.spec @@ -40,7 +40,7 @@ Class: EVAL Group: Network License: GPL Version: %{V_asterisk} -Release: 20060909 +Release: 20060911 # list of sources Source0: ftp://ftp.digium.com/pub/asterisk/releases/asterisk-%{V_asterisk}.tar.gz