package/asterisk/patches/makefiles.diff

   1 diff -ruN asterisk-1.0.7-orig/Makefile asterisk-1.0.7-2/Makefile
   2 --- asterisk-1.0.7-orig/Makefile        2005-03-10 09:15:05.000000000 +0100
   3 +++ asterisk-1.0.7-2/Makefile   2005-03-19 17:38:06.000000000 +0100
   4 @@ -63,10 +63,10 @@
   5  #K6OPT  = -DK6OPT
   6
   7  #Tell gcc to optimize the asterisk's code
   8 -OPTIMIZE+=-O6
   9 +#OPTIMIZE+=-O6
  10
  11  #Include debug symbols in the executables (-g) and profiling info (-pg)
  12 -DEBUG=-g #-pg
  13 +#DEBUG=-g #-pg
  14
  15  # If you are running a radio application, define RADIO_RELAX so that the DTMF
  16  # will be received more reliably
  17 @@ -74,7 +74,7 @@
  18
  19  # If you don't have a lot of memory (e.g. embedded Asterisk), uncomment the
  20  # following to reduce the size of certain static buffers
  21 -#OPTIONS += -DLOW_MEMORY
  22 +OPTIONS += -DLOW_MEMORY
  23
  24  # Optional debugging parameters
  25  DEBUG_THREADS = #-DDEBUG_THREADS #-DDO_CRASH
  26 @@ -112,7 +112,7 @@
  27  BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
  28
  29  ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk
  30 -ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk
  31 +ASTVARLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk
  32  ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
  33  ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
  34  ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
  35 @@ -128,7 +128,7 @@
  36
  37  INCLUDE=-Iinclude -I../include
  38  CFLAGS=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
  39 -CFLAGS+=$(OPTIMIZE)
  40 +CFLAGS+=$(OPTIMIZE) $(CFLAGS_EXTRA)
  41
  42  ifneq ($(PROC),ultrasparc)
  43  CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
  44 @@ -187,7 +187,7 @@
  45  CFLAGS+=# -fomit-frame-pointer
  46  SUBDIRS=res channels pbx apps codecs formats agi cdr astman stdtime
  47  ifeq (${OSARCH},Linux)
  48 -LIBS=-ldl -lpthread
  49 +LIBS=$(LDFLAGS_EXTRA) -ldl -lpthread
  50  endif
  51  LIBS+=-lncurses -lm
  52  ifeq (${OSARCH},Linux)
  53 @@ -205,7 +205,7 @@
  54  ifeq (${OSARCH},OpenBSD)
  55  LIBS=-lcrypto -lpthread -lm -lncurses
  56  endif
  57 -LIBS+=-lssl
  58 +LIBS+=-Wl,-Bstatic -lssl -Wl,-Bdynamic
  59  OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
  60         translate.o file.o say.o pbx.o cli.o md5.o term.o \
  61         ulaw.o alaw.o callerid.o fskmodem.o image.o app.o \
  62 @@ -240,12 +240,12 @@
  63         cd editline && unset CFLAGS LIBS && ./configure ; \
  64
  65  editline/libedit.a: FORCE
  66 -       cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
  67 -       $(MAKE) -C editline libedit.a
  68 +       cd editline && unset CFLAGS LIBS && test -f config.h || CFLAGS="$(OPTIMIZE) $(CFLAGS_EXTRA)" LDFLAGS="$(LDFLAGS_EXTRA)" ./configure
  69 +       $(MAKE) PROC=$(PROC) CFLAGS="$(OPTIMIZE)" -C editline libedit.a
  70
  71  db1-ast/libdb1.a: FORCE
  72         @if [ -d db1-ast ]; then \
  73 -               $(MAKE) -C db1-ast libdb1.a ; \
  74 +               $(MAKE) PROC=$(PROC) OORG="$(OPTIMIZE)" -C db1-ast libdb1.a ; \
  75         else \
  76                 echo "You need to do a cvs update -d not just cvs update"; \
  77                 exit 1; \
  78 @@ -289,7 +289,7 @@
  79
  80  stdtime/libtime.a: FORCE
  81         @if [ -d stdtime ]; then \
  82 -               $(MAKE) -C stdtime libtime.a ; \
  83 +               $(MAKE) PROC=$(PROC) -C stdtime libtime.a ; \
  84         else \
  85                 echo "You need to do a cvs update -d not just cvs update"; \
  86                 exit 1; \
  87 @@ -381,7 +381,7 @@
  88         if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
  89                 install -m 755 contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\
  90         fi
  91 -       for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
  92 +       for x in $(SUBDIRS); do $(MAKE) PROC=$(PROC) -C $$x install || exit 1 ; done
  93         install -d $(DESTDIR)$(ASTHEADERDIR)
  94         install -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
  95         rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/vm
  96 @@ -519,8 +519,8 @@
  97  __rpm: _version
  98         rm -rf /tmp/asterisk ; \
  99         mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \
 100 -       $(MAKE) DESTDIR=/tmp/asterisk install ; \
 101 -       $(MAKE) DESTDIR=/tmp/asterisk samples ; \
 102 +       $(MAKE) PROC=$(PROC) DESTDIR=/tmp/asterisk install ; \
 103 +       $(MAKE) PROC=$(PROC) DESTDIR=/tmp/asterisk samples ; \
 104         mkdir -p /tmp/asterisk/etc/rc.d/init.d ; \
 105         cp -f redhat/asterisk /tmp/asterisk/etc/rc.d/init.d/ ; \
 106         sed "s/^Version:.*/Version: $(RPMVERSION)/g" redhat/asterisk.spec > asterisk.spec ; \
 107 @@ -544,12 +544,12 @@
 108         fi
 109
 110  dont-optimize:
 111 -       $(MAKE) OPTIMIZE= K6OPT= install
 112 +       $(MAKE) PROC=$(PROC) OPTIMIZE= K6OPT= install
 113
 114  valgrind: dont-optimize
 115
 116  depend: .depend
 117 -       for x in $(SUBDIRS); do $(MAKE) -C $$x depend || exit 1 ; done
 118 +       for x in $(SUBDIRS); do $(MAKE) PROC=$(PROC) -C $$x depend || exit 1 ; done
 119
 120  .depend:
 121         @if ! which mpg123 &>/dev/null ; then \
 122 diff -ruN asterisk-1.0.7-orig/apps/Makefile asterisk-1.0.7-2/apps/Makefile
 123 --- asterisk-1.0.7-orig/apps/Makefile   2004-09-24 23:32:56.000000000 +0200
 124 +++ asterisk-1.0.7-2/apps/Makefile      2005-03-19 17:38:06.000000000 +0100
 125 @@ -35,13 +35,14 @@
 126  APPS+=app_intercom.so
 127  endif
 128
 129 -#APPS+=app_sql_postgres.so
 130 +# add extra apps
 131 +APPS+=$(EXTRA_APPS)
 132  #APPS+=app_sql_odbc.so
 133  #APPS+=app_rpt.so
 134
 135 -APPS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
 136 -APPS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
 137 -APPS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "app_osplookup.so" ; fi)
 138 +#APPS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
 139 +#APPS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
 140 +#APPS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "app_osplookup.so" ; fi)
 141
 142  CFLAGS+=-fPIC
 143
 144 diff -ruN asterisk-1.0.7-orig/cdr/Makefile asterisk-1.0.7-2/cdr/Makefile
 145 --- asterisk-1.0.7-orig/cdr/Makefile    2004-08-31 18:33:00.000000000 +0200
 146 +++ asterisk-1.0.7-2/cdr/Makefile       2005-03-19 17:38:06.000000000 +0100
 147 @@ -12,7 +12,7 @@
 148  #
 149
 150  #ADD cdr_pgsql.so to MODS= to include PostgreSQL support: REQUIRES PostgreSQL libs
 151 -MODS=cdr_csv.so cdr_manager.so
 152 +MODS=cdr_csv.so cdr_manager.so $(EXTRA_MODS)
 153
 154
 155  CFLAGS+=-fPIC
 156 diff -ruN asterisk-1.0.7-orig/channels/Makefile asterisk-1.0.7-2/channels/Makefile
 157 --- asterisk-1.0.7-orig/channels/Makefile       2004-08-31 18:33:00.000000000 +0200
 158 +++ asterisk-1.0.7-2/channels/Makefile  2005-03-19 17:38:06.000000000 +0100
 159 @@ -71,25 +71,25 @@
 160  CHANNEL_LIBS+=chan_oss.so
 161  endif
 162
 163 -CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so)
 164 -CHANNEL_LIBS+=$(shell [ -f /usr/local/include/ixjuser.h ] && echo chan_phone.so)
 165 -CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so)
 166 -
 167 -CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
 168 -CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API")
 169 -CHANNEL_LIBS+=$(shell [ -f /usr/include/alsa/asoundlib.h ] && echo "chan_alsa.so")
 170 -CFLAGS+=$(shell [ -f /usr/lib/libpri.so.1 ] && echo " -DZAPATA_PRI")
 171 -CFLAGS+=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo " -DZAPATA_R2")
 172 -CFLAGS+=$(shell [ -f alsa-monitor.h ] && echo " -DALSA_MONITOR")
 173 -ZAPPRI=$(shell [ -f /usr/lib/libpri.so.1 ] && echo "-lpri")
 174 -ZAPR2=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo "-lmfcr2")
 175 -CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING")
 176 -CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "-DIAX_TRUNKING")
 177 -CHANNEL_LIBS+=$(shell [ -f /usr/include/vpbapi.h ] && echo "chan_vpb.so" )
 178 -CFLAGS+=$(shell [ -f /usr/include/vpbapi.h ] && echo " -DLINUX")
 179 +#CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so)
 180 +#CHANNEL_LIBS+=$(shell [ -f /usr/local/include/ixjuser.h ] && echo chan_phone.so)
 181 +#CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so)
 182 +
 183 +#CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
 184 +#CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API")
 185 +#CHANNEL_LIBS+=$(shell [ -f /usr/include/alsa/asoundlib.h ] && echo "chan_alsa.so")
 186 +#CFLAGS+=$(shell [ -f /usr/lib/libpri.so.1 ] && echo " -DZAPATA_PRI")
 187 +#CFLAGS+=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo " -DZAPATA_R2")
 188 +#CFLAGS+=$(shell [ -f alsa-monitor.h ] && echo " -DALSA_MONITOR")
 189 +#ZAPPRI=$(shell [ -f /usr/lib/libpri.so.1 ] && echo "-lpri")
 190 +#ZAPR2=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo "-lmfcr2")
 191 +#CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING")
 192 +#CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "-DIAX_TRUNKING")
 193 +#CHANNEL_LIBS+=$(shell [ -f /usr/include/vpbapi.h ] && echo "chan_vpb.so" )
 194 +#CFLAGS+=$(shell [ -f /usr/include/vpbapi.h ] && echo " -DLINUX")
 195
 196 -ALSA_SRC=chan_alsa.c
 197 -ALSA_SRC+=$(shell [ -f alsa-monitor.h ] && echo "alsa-monitor.h")
 198 +#ALSA_SRC=chan_alsa.c
 199 +#ALSA_SRC+=$(shell [ -f alsa-monitor.h ] && echo "alsa-monitor.h")
 200
 201  CFLAGS+=-DCRYPTO
 202  CFLAGS+=-fPIC
 203 @@ -106,10 +106,10 @@
 204
 205  ZAPDIR=/usr/lib
 206
 207 -CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so")
 208 -CHANNEL_LIBS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "chan_zap.so")
 209 +#CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so")
 210 +#CHANNEL_LIBS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "chan_zap.so")
 211
 212 -CHANNEL_LIBS+=$(shell [ -f /usr/include/nbs.h ] && echo "chan_nbs.so" )
 213 +#CHANNEL_LIBS+=$(shell [ -f /usr/include/nbs.h ] && echo "chan_nbs.so" )
 214
 215  ifndef OPENH323DIR
 216  OPENH323DIR=$(HOME)/openh323
 217 diff -ruN asterisk-1.0.7-orig/channels/h323/Makefile asterisk-1.0.7-2/channels/h323/Makefile
 218 --- asterisk-1.0.7-orig/channels/h323/Makefile  2004-11-15 03:35:35.000000000 +0100
 219 +++ asterisk-1.0.7-2/channels/h323/Makefile     2005-03-19 17:38:06.000000000 +0100
 220 @@ -22,9 +22,11 @@
 221  OSARCH=$(shell uname -s)
 222  ifneq (${OSARCH},FreeBSD)
 223  ifneq (${OSARCH},NetBSD)
 224 +ifneq ($(PROC),mipsel)
 225  CFLAGS += -march=$(shell uname -m)
 226  endif
 227  endif
 228 +endif
 229  CFLAGS += -DPBYTE_ORDER=PLITTLE_ENDIAN
 230
 231  ifeq (${OSARCH},Linux)
 232 @@ -47,7 +49,7 @@
 233
 234  # Pre Janus release directives
 235  CFLAGS += -DNDEBUG -DDO_CRASH -DDEBUG_THREADS
 236 -CFLAGS += -pipe -Wall -fPIC
 237 +CFLAGS += -pipe -Wall -fPIC $(OPTIMIZE)
 238  ifeq (${OSARCH},Linux)
 239  CFLAGS += -DP_LINUX
 240  LIBS+=-lpthread
 241 @@ -74,7 +76,7 @@
 242
 243
 244  libchanh323.a: ast_h323.o
 245 -       ar cr libchanh323.a ast_h323.o
 246 +       $(AR) cr libchanh323.a ast_h323.o
 247
 248  ast_h323.o:    ast_h323.cpp
 249         $(CXX) -g -c -fno-rtti -o $@ $(CFLAGS) $<
 250 diff -ruN asterisk-1.0.7-orig/codecs/Makefile asterisk-1.0.7-2/codecs/Makefile
 251 --- asterisk-1.0.7-orig/codecs/Makefile 2005-03-17 15:43:51.000000000 +0100
 252 +++ asterisk-1.0.7-2/codecs/Makefile    2005-03-22 23:26:20.000000000 +0100
 253 @@ -17,21 +17,21 @@
 254  # g723.1b)
 255  #
 256  #MODG723=codec_g723_1.so codec_g723_1b.so
 257 -MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
 258 -MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
 259 -MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/include/speex/speex.h ] || [ -f /usr/local/include/speex.h ] || [ -f /usr/local/include/speex/speex.h ] && echo "codec_speex.so")
 260 +#MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
 261 +#MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
 262 +MODSPEEX=codec_speex.so
 263  MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
 264  CFLAGS+=-fPIC
 265 -CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include")
 266 -CFLAGS+=$(shell [ -f /usr/local/include/speex/speex.h ] && echo "-I/usr/local/include/speex")
 267 -CFLAGS+=$(shell [ -f /usr/include/speex/speex.h ] && echo "-I/usr/include/speex")
 268 +#CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include")
 269 +#CFLAGS+=$(shell [ -f /usr/local/include/speex/speex.h ] && echo "-I/usr/local/include/speex")
 270 +#CFLAGS+=$(shell [ -f /usr/include/speex/speex.h ] && echo "-I/usr/include/speex")
 271
 272  LIBG723=g723.1/libg723.a
 273  LIBG723B=g723.1b/libg723b.a
 274  LIBGSM=gsm/lib/libgsm.a
 275  LIBGSMT=gsm/lib/libgsm.a
 276  LIBLPC10=lpc10/liblpc10.a
 277 -LIBSPEEX=$(shell [ -f /usr/local/lib/libspeex.a ] && echo "-L/usr/local/lib")
 278 +LIBSPEEX=$(LDFLAGS_EXTRA)
 279  LIBSPEEX+=-lspeex -lm
 280  LIBILBC=ilbc/libilbc.a
 281
 282 @@ -43,26 +43,26 @@
 283
 284  clean:
 285         rm -f *.so *.o .depend
 286 -       ! [ -d g723.1 ] || $(MAKE) -C g723.1 clean
 287 -       ! [ -d g723.1b ] || $(MAKE) -C g723.1b clean
 288 -       $(MAKE) -C gsm clean
 289 -       $(MAKE) -C lpc10 clean
 290 -       $(MAKE) -C ilbc clean
 291 +       ! [ -d g723.1 ] || $(MAKE) PROC=$(PROC) -C g723.1 clean
 292 +       ! [ -d g723.1b ] || $(MAKE) PROC=$(PROC) -C g723.1b clean
 293 +       $(MAKE) PROC=$(PROC) -C gsm clean
 294 +       $(MAKE) PROC=$(PROC) -C lpc10 clean
 295 +       $(MAKE) PROC=$(PROC) -C ilbc clean
 296
 297  $(LIBG723):
 298 -       $(MAKE) -C g723.1 all
 299 +       $(MAKE) PROC=$(PROC) -C g723.1 all
 300
 301  gsm/lib/libgsm.a:
 302 -       $(MAKE) -C gsm lib/libgsm.a
 303 +       $(MAKE) PROC=$(PROC) -C gsm lib/libgsm.a
 304
 305  $(LIBG723B):
 306 -       $(MAKE) -C g723.1b all
 307 +       $(MAKE) PROC=$(PROC) -C g723.1b all
 308
 309  $(LIBLPC10):
 310 -       $(MAKE) -C lpc10 all
 311 +       $(MAKE) PROC=$(PROC) -C lpc10 all
 312
 313  $(LIBILBC):
 314 -       $(MAKE) -C ilbc all
 315 +       $(MAKE) PROC=$(PROC) -C ilbc all
 316
 317  codec_ilbc.so: codec_ilbc.o $(LIBILBC)
 318         $(CC) $(SOLINK) -o $@ $< $(LIBILBC)
 319 diff -ruN asterisk-1.0.7-orig/codecs/gsm/Makefile asterisk-1.0.7-2/codecs/gsm/Makefile
 320 --- asterisk-1.0.7-orig/codecs/gsm/Makefile     2004-12-21 21:49:24.000000000 +0100
 321 +++ asterisk-1.0.7-2/codecs/gsm/Makefile        2005-03-19 17:38:06.000000000 +0100
 322 @@ -40,9 +40,10 @@
 323  ifneq (${OSARCH},Darwin)
 324  ifneq (${PROC},x86_64)
 325  ifneq (${PROC},ultrasparc)
 326 -ifneq ($(shell uname -m),ppc)
 327 -ifneq ($(shell uname -m),alpha)
 328 +ifneq ($(PROC),ppc)
 329 +ifneq ($(PROC),alpha)
 330  ifneq (${PROC},sparc64)
 331 +ifneq ($(PROC),mipsel)
 332  OPTIMIZE+=-march=$(PROC)
 333  endif
 334  endif
 335 @@ -50,6 +51,7 @@
 336  endif
 337  endif
 338  endif
 339 +endif
 340
 341  #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
 342  #This works for even old (2.96) versions of gcc and provides a small boost either way.
 343 @@ -78,7 +80,7 @@
 344  # CCFLAGS      = -c -O
 345
 346  CC             ?= gcc
 347 -CCFLAGS        += -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC $(OPTIMIZE) -fomit-frame-pointer
 348 +CCFLAGS        += -c -DNeedFunctionPrototypes=1 -fPIC $(OPTIMIZE)
 349
 350  LD             = $(CC)
 351
 352 @@ -213,16 +215,18 @@
 353                 $(SRC)/short_term.c     \
 354                 $(SRC)/table.c
 355  ifeq (${OSARCH},Linux)
 356 -ifneq ($(shell uname -m),x86_64)
 357 -ifneq ($(shell uname -m),ppc)
 358 -ifneq ($(shell uname -m),alpha)
 359 -ifneq ($(shell uname -m),sparc64)
 360 +ifneq ($(PROC),x86_64)
 361 +ifneq ($(PROC),ppc)
 362 +ifneq ($(PROC),alpha)
 363 +ifneq ($(PROC),sparc64)
 364 +ifneq ($(PROC),mipsel)
 365  GSM_SOURCES+= $(SRC)/k6opt.s
 366  endif
 367  endif
 368  endif
 369  endif
 370  endif
 371 +endif
 372
 373  TOAST_SOURCES = $(SRC)/toast.c                 \
 374                 $(SRC)/toast_lin.c      \
 375 @@ -269,16 +273,18 @@
 376                 $(SRC)/table.o
 377
 378  ifeq (${OSARCH},Linux)
 379 -ifneq ($(shell uname -m), x86_64)
 380 -ifneq ($(shell uname -m), ppc)
 381 -ifneq ($(shell uname -m), alpha)
 382 -ifneq ($(shell uname -m), sparc64)
 383 +ifneq ($(PROC), x86_64)
 384 +ifneq ($(PROC), ppc)
 385 +ifneq ($(PROC), alpha)
 386 +ifneq ($(PROC), sparc64)
 387 +ifneq ($(PROC), mipsel)
 388  GSM_OBJECTS+= $(SRC)/k6opt.o
 389  endif
 390  endif
 391  endif
 392  endif
 393  endif
 394 +endif
 395
 396  TOAST_OBJECTS =        $(SRC)/toast.o          \
 397                 $(SRC)/toast_lin.o      \
 398 diff -ruN asterisk-1.0.7-orig/codecs/ilbc/Makefile asterisk-1.0.7-2/codecs/ilbc/Makefile
 399 --- asterisk-1.0.7-orig/codecs/ilbc/Makefile    2004-08-29 19:40:58.000000000 +0200
 400 +++ asterisk-1.0.7-2/codecs/ilbc/Makefile       2005-03-19 17:38:06.000000000 +0100
 401 @@ -1,5 +1,5 @@
 402  ARCH=$(PROC)
 403 -CFLAGS+=-Wall -fPIC -O3 -funroll-loops -fomit-frame-pointer
 404 +CFLAGS+=-Wall -fPIC $(OPTIMIZE)
 405  LIB=libilbc.a
 406
 407  OBJS= anaFilter.o iCBSearch.o packing.o \
 408 @@ -12,8 +12,8 @@
 409
 410
 411  $(LIB): $(OBJS)
 412 -       ar cr $(LIB) $(OBJS)
 413 -       ranlib $(LIB)
 414 +       $(AR) cr $(LIB) $(OBJS)
 415 +       $(RANLIB) $(LIB)
 416
 417  clean:
 418         rm -f $(LIB) *.o
 419 diff -ruN asterisk-1.0.7-orig/codecs/lpc10/Makefile asterisk-1.0.7-2/codecs/lpc10/Makefile
 420 --- asterisk-1.0.7-orig/codecs/lpc10/Makefile   2004-08-31 18:33:00.000000000 +0200
 421 +++ asterisk-1.0.7-2/codecs/lpc10/Makefile      2005-03-19 17:38:06.000000000 +0100
 422 @@ -31,6 +31,7 @@
 423  ifneq ($(PROC),ppc)
 424  ifneq ($(PROC),x86_64)
 425  ifneq ($(PROC),alpha)
 426 +ifneq ($(PROC),mipsel)
 427  #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
 428  #This works for even old (2.96) versions of gcc and provides a small boost either way.
 429  #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn.t support it.
 430 @@ -46,6 +47,7 @@
 431  endif
 432  endif
 433  endif
 434 +endif
 435
 436  LIB = $(LIB_TARGET_DIR)/liblpc10.a
 437
 438 @@ -62,7 +64,7 @@
 439
 440  $(LIB): $(OBJ)
 441         $(AR) cr $@ $(OBJ)
 442 -       ranlib $@
 443 +       $(RANLIB) $@
 444
 445  clean:
 446         -rm -f *.o $(LIB)
 447 diff -ruN asterisk-1.0.7-orig/configs/modules.conf.sample asterisk-1.0.7-2/configs/modules.conf.sample
 448 --- asterisk-1.0.7-orig/configs/modules.conf.sample     2003-06-26 20:57:54.000000000 +0200
 449 +++ asterisk-1.0.7-2/configs/modules.conf.sample        2005-03-19 17:38:06.000000000 +0100
 450 @@ -23,8 +23,8 @@
 451  ; Explicitly load the chan_modem.so early on to be sure
 452  ; it loads before any of the chan_modem_* 's afte rit
 453  ;
 454 -load => chan_modem.so
 455 -load => res_musiconhold.so
 456 +noload => chan_modem.so
 457 +noload => res_musiconhold.so
 458  ;
 459  ; Load either OSS or ALSA, not both
 460  ; By default, load OSS only (automatically) and do not load ALSA
 461 @@ -36,4 +36,12 @@
 462  ; exported to modules loaded after them.
 463  ;
 464  [global]
 465 -chan_modem.so=yes
 466 +; chan_modem.so=yes
 467 +noload => app_adsiprog.so
 468 +noload => app_db.so
 469 +noload => app_hasnewvoicemail.so
 470 +noload => app_voicemail.so
 471 +noload => chan_skinny.so
 472 +noload => cdr_csv.so
 473 +noload => res_adsi.so
 474 +noload => res_agi.so
 475 diff -ruN asterisk-1.0.7-orig/db1-ast/Makefile asterisk-1.0.7-2/db1-ast/Makefile
 476 --- asterisk-1.0.7-orig/db1-ast/Makefile        2004-08-31 18:33:00.000000000 +0200
 477 +++ asterisk-1.0.7-2/db1-ast/Makefile   2005-03-19 17:38:06.000000000 +0100
 478 @@ -32,8 +32,8 @@
 479
 480  $(LIBDB): $(OBJS)
 481         rm -f $@
 482 -       ar cq $@ $(OBJS)
 483 -       ranlib $@
 484 +       $(AR) cq $@ $(OBJS)
 485 +       $(RANLIB) $@
 486
 487  $(LIBDBSO): $(SHOBJS)
 488         $(CC) -Wl,-O1 -Wl,--version-script=libdb.map -Wl,-soname=$(LIBDBSO) -shared -o $@ $^
 489 diff -ruN asterisk-1.0.7-orig/dns.c asterisk-1.0.7-2/dns.c
 490 --- asterisk-1.0.7-orig/dns.c   2004-06-22 22:11:15.000000000 +0200
 491 +++ asterisk-1.0.7-2/dns.c      2005-03-19 17:38:06.000000000 +0100
 492 @@ -153,7 +153,13 @@
 493
 494  #if defined(res_ninit)
 495  #define HAS_RES_NINIT
 496 -#else
 497 +#endif
 498 +
 499 +#ifdef __UCLIBC__
 500 +#undef HAS_RES_NINIT
 501 +#endif
 502 +
 503 +#ifndef HAS_RES_NINIT
 504  AST_MUTEX_DEFINE_STATIC(res_lock);
 505  #if 0
 506  #warning "Warning, res_ninit is missing...  Could have reentrancy issues"
 507 diff -ruN asterisk-1.0.7-orig/res/Makefile asterisk-1.0.7-2/res/Makefile
 508 --- asterisk-1.0.7-orig/res/Makefile    2004-07-17 22:58:01.000000000 +0200
 509 +++ asterisk-1.0.7-2/res/Makefile       2005-03-19 17:58:17.000000000 +0100
 510 @@ -13,9 +13,9 @@
 511
 512  MODS=res_adsi.so res_features.so res_crypto.so res_musiconhold.so res_indications.so res_monitor.so \
 513       res_agi.so
 514 -MODS+=$(shell if [ -f "/usr/include/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi)
 515 -MODS+=$(shell if [ -f "/usr/local/include/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi)
 516 -MODS+=$(shell if [ -f "/usr/include/osp/osp.h" ]; then echo "res_osp.so"; fi)
 517 +#MODS+=$(shell if [ -f "/usr/include/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi)
 518 +#MODS+=$(shell if [ -f "/usr/local/include/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi)
 519 +#MODS+=$(shell if [ -f "/usr/include/osp/osp.h" ]; then echo "res_osp.so"; fi)
 520
 521  CRYPTO_LIBS=-lssl -lcrypto
 522
 523 diff -ruN asterisk-1.0.7-orig/stdtime/Makefile asterisk-1.0.7-2/stdtime/Makefile
 524 --- asterisk-1.0.7-orig/stdtime/Makefile        2003-11-05 07:19:41.000000000 +0100
 525 +++ asterisk-1.0.7-2/stdtime/Makefile   2005-03-19 17:38:06.000000000 +0100
 526 @@ -3,8 +3,8 @@
 527  all: libtime.a
 528
 529  libtime.a: $(OBJS)
 530 -       ar rv $@ $(OBJS)
 531 -       ranlib $@
 532 +       $(AR) rv $@ $(OBJS)
 533 +       $(RANLIB) $@
 534
 535  install:
 536
 537 diff -urN asterisk-1.0.7.old/codecs/Makefile asterisk-1.0.7/codecs/Makefile
 538 --- asterisk-1.0.7.old/codecs/Makefile  2005-04-10 19:40:28.000000000 +0200
 539 +++ asterisk-1.0.7/codecs/Makefile      2005-04-10 19:51:15.000000000 +0200
 540 @@ -19,7 +19,6 @@
 541  #MODG723=codec_g723_1.so codec_g723_1b.so
 542  #MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
 543  #MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
 544 -MODSPEEX=codec_speex.so
 545  MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
 546  CFLAGS+=-fPIC
 547  #CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include")