code.vuplus.com Git - vuplus_openembedded/blob - packages/asterisk/asterisk-1.0.9/makefile.patch

   1
   2 #
   3 # Patch managed by http://www.holgerschurig.de/patcher.html
   4 #
   5
   6 --- asterisk-1.0.7/Makefile~makefile.patch
   7 +++ asterisk-1.0.7/Makefile
   8 @@ -127,64 +127,67 @@
   9  AGI_DIR=$(ASTVARLIBDIR)/agi-bin
  10
  11  INCLUDE=-Iinclude -I../include
  12 -CFLAGS=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
  13 -CFLAGS+=$(OPTIMIZE)
  14 +my_CFLAGS=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
  15 +my_CFLAGS+=$(OPTIMIZE)
  16
  17  ifneq ($(PROC),ultrasparc)
  18 -CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
  19 +my_CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
  20  endif
  21
  22 -CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
  23 -CFLAGS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "-DOSP_SUPPORT -I/usr/include/osp" ; fi)
  24 +my_CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
  25 +my_CFLAGS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "-DOSP_SUPPORT -I/usr/include/osp" ; fi)
  26
  27  ifeq (${OSARCH},FreeBSD)
  28  OSVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
  29 -CFLAGS+=$(shell if test ${OSVERSION} -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
  30 +my_CFLAGS+=$(shell if test ${OSVERSION} -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
  31  LIBS+=$(shell if test  ${OSVERSION} -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
  32  INCLUDE+=-I/usr/local/include
  33 -CFLAGS+=$(shell if [ -d /usr/local/include/spandsp ]; then echo "-I/usr/local/include/spandsp"; fi)
  34 +my_CFLAGS+=$(shell if [ -d /usr/local/include/spandsp ]; then echo "-I/usr/local/include/spandsp"; fi)
  35  MPG123TARG=freebsd
  36  endif # FreeBSD
  37
  38  ifeq (${OSARCH},NetBSD)
  39 -CFLAGS+=-pthread
  40 +my_CFLAGS+=-pthread
  41  INCLUDE+=-I/usr/local/include -I/usr/pkg/include
  42  MPG123TARG=netbsd
  43  endif
  44
  45  ifeq (${OSARCH},OpenBSD)
  46 -CFLAGS+=-pthread
  47 +my_CFLAGS+=-pthread
  48  endif
  49
  50  #Uncomment this to use the older DSP routines
  51  #CFLAGS+=-DOLD_DSP_ROUTINES
  52
  53 -CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
  54 -CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
  55 +my_CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
  56 +my_CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
  57
  58  LIBEDIT=editline/libedit.a
  59
  60  ASTERISKVERSION=$(shell if [ -f .version ]; then cat .version; else if [ -d CVS ]; then if [ -f CVS/Tag ] ; then echo "CVS-`sed 's/^T//g' CVS/Tag`-`date +"%D-%T"`"; else echo "CVS-HEAD-`date +"%D-%T"`"; fi; fi; fi)
  61  HTTPDIR=$(shell if [ -d /var/www ]; then echo "/var/www"; else echo "/home/httpd"; fi)
  62  RPMVERSION=$(shell if [ -f .version ]; then sed 's/[-\/:]/_/g' .version; else echo "unknown" ; fi)
  63 -CFLAGS+=-DASTERISK_VERSION=\"$(ASTERISKVERSION)\"
  64 -CFLAGS+=-DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\"
  65 -CFLAGS+=-DASTETCDIR=\"$(ASTETCDIR)\"
  66 -CFLAGS+=-DASTLIBDIR=\"$(ASTLIBDIR)\"
  67 -CFLAGS+=-DASTVARLIBDIR=\"$(ASTVARLIBDIR)\"
  68 -CFLAGS+=-DASTVARRUNDIR=\"$(ASTVARRUNDIR)\"
  69 -CFLAGS+=-DASTSPOOLDIR=\"$(ASTSPOOLDIR)\"
  70 -CFLAGS+=-DASTLOGDIR=\"$(ASTLOGDIR)\"
  71 -CFLAGS+=-DASTCONFPATH=\"$(ASTCONFPATH)\"
  72 -CFLAGS+=-DASTMODDIR=\"$(MODULES_DIR)\"
  73 -CFLAGS+=-DASTAGIDIR=\"$(AGI_DIR)\"
  74 +my_CFLAGS+=-DASTERISK_VERSION=\"$(ASTERISKVERSION)\"
  75 +my_CFLAGS+=-DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\"
  76 +my_CFLAGS+=-DASTETCDIR=\"$(ASTETCDIR)\"
  77 +my_CFLAGS+=-DASTLIBDIR=\"$(ASTLIBDIR)\"
  78 +my_CFLAGS+=-DASTVARLIBDIR=\"$(ASTVARLIBDIR)\"
  79 +my_CFLAGS+=-DASTVARRUNDIR=\"$(ASTVARRUNDIR)\"
  80 +my_CFLAGS+=-DASTSPOOLDIR=\"$(ASTSPOOLDIR)\"
  81 +my_CFLAGS+=-DASTLOGDIR=\"$(ASTLOGDIR)\"
  82 +my_CFLAGS+=-DASTCONFPATH=\"$(ASTCONFPATH)\"
  83 +my_CFLAGS+=-DASTMODDIR=\"$(MODULES_DIR)\"
  84 +my_CFLAGS+=-DASTAGIDIR=\"$(AGI_DIR)\"
  85 +
  86 +my_CFLAGS+= $(DEBUG_THREADS)
  87 +my_CFLAGS+= $(TRACE_FRAMES)
  88 +my_CFLAGS+= $(MALLOC_DEBUG)
  89 +my_CFLAGS+= $(BUSYDETECT)
  90 +my_CFLAGS+= $(OPTIONS)
  91 +my_CFLAGS+=# -fomit-frame-pointer
  92 +
  93 +override CFLAGS += $(my_CFLAGS)
  94
  95 -CFLAGS+= $(DEBUG_THREADS)
  96 -CFLAGS+= $(TRACE_FRAMES)
  97 -CFLAGS+= $(MALLOC_DEBUG)
  98 -CFLAGS+= $(BUSYDETECT)
  99 -CFLAGS+= $(OPTIONS)
 100 -CFLAGS+=# -fomit-frame-pointer
 101  SUBDIRS=res channels pbx apps codecs formats agi cdr astman stdtime
 102  ifeq (${OSARCH},Linux)
 103  LIBS=-ldl -lpthread
 104 @@ -296,7 +299,7 @@
 105         fi
 106
 107  asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
 108 -       $(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS)
 109 +       $(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LDFLAGS) $(LIBS)
 110
 111  muted: muted.o
 112         $(CC) -o muted muted.o
 113 --- asterisk-1.0.7/res/Makefile~makefile.patch
 114 +++ asterisk-1.0.7/res/Makefile
 115 @@ -13,15 +13,13 @@
 116
 117  MODS=res_adsi.so res_features.so res_crypto.so res_musiconhold.so res_indications.so res_monitor.so \
 118       res_agi.so
 119 -MODS+=$(shell if [ -f "/usr/include/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi)
 120 -MODS+=$(shell if [ -f "/usr/local/include/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi)
 121 -MODS+=$(shell if [ -f "/usr/include/osp/osp.h" ]; then echo "res_osp.so"; fi)
 122 +MODS+=$(shell if [ -f "${STAGING_INCDIR}/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi)
 123 +MODS+=$(shell if [ -f "${STAGING_INCDIR}/osp/osp.h" ]; then echo "res_osp.so"; fi)
 124
 125  CRYPTO_LIBS=-lssl -lcrypto
 126
 127  CFLAGS+=
 128 -CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo " -DZAPATA_MOH")
 129 -CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo " -DZAPATA_MOH")
 130 +CFLAGS+=$(shell [ -f ${STAGING_INCDIR}/linux/zaptel.h ] && echo " -DZAPATA_MOH")
 131  #
 132  # Work around buggy RedHat 9.0
 133  #
 134 @@ -37,7 +35,7 @@
 135         for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
 136
 137  res_crypto.so: res_crypto.o
 138 -       $(CC) $(SOLINK) -o $@ $< $(CRYPTO_LIBS)
 139 +       $(CC) $(SOLINK) -o $@ $< $(LDFLAGS) $(CRYPTO_LIBS)
 140
 141  clean:
 142         rm -f *.so *.o .depend
 143 --- asterisk-1.0.7/channels/Makefile~makefile.patch
 144 +++ asterisk-1.0.7/channels/Makefile
 145 @@ -71,22 +71,20 @@
 146  CHANNEL_LIBS+=chan_oss.so
 147  endif
 148
 149 -CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so)
 150 -CHANNEL_LIBS+=$(shell [ -f /usr/local/include/ixjuser.h ] && echo chan_phone.so)
 151 +CHANNEL_LIBS+=$(shell [ -f ${STAGING_INCDIR}/linux/ixjuser.h ] && echo chan_phone.so)
 152  CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so)
 153
 154  CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
 155 -CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API")
 156 -CHANNEL_LIBS+=$(shell [ -f /usr/include/alsa/asoundlib.h ] && echo "chan_alsa.so")
 157 -CFLAGS+=$(shell [ -f /usr/lib/libpri.so.1 ] && echo " -DZAPATA_PRI")
 158 -CFLAGS+=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo " -DZAPATA_R2")
 159 +CFLAGS+=$(shell [ ! -f ${STAGING_INCDIR}/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API")
 160 +CHANNEL_LIBS+=$(shell [ -f ${STAGING_INCDIR}/alsa/asoundlib.h ] && echo "chan_alsa.so")
 161 +CFLAGS+=$(shell [ -f ${STAGING_LIBDIR}/libpri.so.1 ] && echo " -DZAPATA_PRI")
 162 +CFLAGS+=$(shell [ -f ${STAGING_LIBDIR}/libmfcr2.so.1 ] && echo " -DZAPATA_R2")
 163  CFLAGS+=$(shell [ -f alsa-monitor.h ] && echo " -DALSA_MONITOR")
 164 -ZAPPRI=$(shell [ -f /usr/lib/libpri.so.1 ] && echo "-lpri")
 165 -ZAPR2=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo "-lmfcr2")
 166 -CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING")
 167 -CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "-DIAX_TRUNKING")
 168 -CHANNEL_LIBS+=$(shell [ -f /usr/include/vpbapi.h ] && echo "chan_vpb.so" )
 169 -CFLAGS+=$(shell [ -f /usr/include/vpbapi.h ] && echo " -DLINUX")
 170 +ZAPPRI=$(shell [ -f ${STAGING_LIBDIR}/libpri.so.1 ] && echo "-lpri")
 171 +ZAPR2=$(shell [ -f ${STAGING_LIBDIR}/libmfcr2.so.1 ] && echo "-lmfcr2")
 172 +CFLAGS+=$(shell [ -f ${STAGING_INCDIR}/linux/zaptel.h ] && echo "-DIAX_TRUNKING")
 173 +CHANNEL_LIBS+=$(shell [ -f ${STAGING_INCDIR}/vpbapi.h ] && echo "chan_vpb.so" )
 174 +CFLAGS+=$(shell [ -f ${STAGING_INCDIR}/vpbapi.h ] && echo " -DLINUX")
 175
 176  ALSA_SRC=chan_alsa.c
 177  ALSA_SRC+=$(shell [ -f alsa-monitor.h ] && echo "alsa-monitor.h")
 178 @@ -106,10 +104,9 @@
 179
 180  ZAPDIR=/usr/lib
 181
 182 -CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so")
 183 -CHANNEL_LIBS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "chan_zap.so")
 184 +CHANNEL_LIBS+=$(shell [ -f ${STAGING_INCDIR}/linux/zaptel.h ] && echo "chan_zap.so")
 185
 186 -CHANNEL_LIBS+=$(shell [ -f /usr/include/nbs.h ] && echo "chan_nbs.so" )
 187 +CHANNEL_LIBS+=$(shell [ -f ${STAGING_INCDIR}/nbs.h ] && echo "chan_nbs.so" )
 188
 189  ifndef OPENH323DIR
 190  OPENH323DIR=$(HOME)/openh323
 191 @@ -135,10 +132,10 @@
 192  endif
 193
 194  gentone: gentone.c
 195 -       $(CC) -o gentone gentone.c -lm
 196 +       $(BUILD_CC) -o gentone gentone.c -lm
 197
 198  gentone-ulaw: gentone-ulaw.c
 199 -       $(CC) -o gentone-ulaw gentone-ulaw.c -lm
 200 +       $(BUILD_CC) -o gentone-ulaw gentone-ulaw.c -lm
 201
 202  busy.h: gentone
 203         ./gentone busy 480 620
 204 --- asterisk-1.0.7/pbx/Makefile~makefile.patch
 205 +++ asterisk-1.0.7/pbx/Makefile
 206 @@ -16,7 +16,7 @@
 207  PBX_LIBS=pbx_config.so pbx_wilcalu.so pbx_spool.so     # pbx_gtkconsole.so pbx_kdeconsole.so
 208
 209  # Add GTK console if appropriate
 210 -PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so")
 211 +PBX_LIBS+=$(shell ${STAGING_BINDIR}/gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so")
 212  # Add KDE Console if appropriate
 213  #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so")
 214
 215 --- asterisk-1.0.7/codecs/lpc10/Makefile~makefile.patch
 216 +++ asterisk-1.0.7/codecs/lpc10/Makefile
 217 @@ -25,28 +25,6 @@
 218  CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
 219  #CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi)
 220
 221 -#fix for PPC processors and ALPHA, And UltraSparc too
 222 -ifneq ($(OSARCH),Darwin)
 223 -ifneq ($(findstring BSD,${OSARCH}),BSD)
 224 -ifneq ($(PROC),ppc)
 225 -ifneq ($(PROC),x86_64)
 226 -ifneq ($(PROC),alpha)
 227 -#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
 228 -#This works for even old (2.96) versions of gcc and provides a small boost either way.
 229 -#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn.t support it.
 230 -#So we go lowest common available by gcc and go a step down, still a step up from
 231 -#the default as we now have a better instruction set to work with. - Belgarath
 232 -ifeq ($(PROC),ultrasparc)
 233 -        CFLAGS+= -mtune=$(PROC) -mcpu=v8 -O3 -fomit-frame-pointer
 234 -else
 235 -        CFLAGS+= -march=$(PROC)
 236 -endif
 237 -endif
 238 -endif
 239 -endif
 240 -endif
 241 -endif
 242 -
 243  LIB = $(LIB_TARGET_DIR)/liblpc10.a
 244
 245  .PHONY: all clean
 246 --- asterisk-1.0.7/cdr/Makefile~makefile.patch
 247 +++ asterisk-1.0.7/cdr/Makefile
 248 @@ -37,36 +37,25 @@
 249  #
 250  # unixODBC stuff...
 251  #
 252 -MODS+=$(shell if [ -f "/usr/include/odbcinst.h" ]; then echo "cdr_odbc.so"; fi)
 253 -MODS+=$(shell if [ -f "/usr/local/include/odbcinst.h" ]; then echo "cdr_odbc.so"; fi)
 254 +MODS+=$(shell if [ -f "${STAGING_INCDIR}/odbcinst.h" ]; then echo "cdr_odbc.so"; fi)
 255
 256  #
 257  # FreeTDS stuff...
 258  #
 259 -MODS+=$(shell if [ -f "/usr/include/tds.h" ]; then echo "cdr_tds.so"; fi)
 260 -MODS+=$(shell if [ -f "/usr/local/include/tds.h" ]; then echo "cdr_tds.so"; fi)
 261 +MODS+=$(shell if [ -f "${STAGING_INCDIR}/tds.h" ]; then echo "cdr_tds.so"; fi)
 262
 263  #
 264  # PGSQL stuff...  Autoconf anyone??
 265  #
 266 -MODS+=$(shell if [ -d /usr/local/pgsql/include ] || [ -d /usr/include/pgsql ] || [ -d /usr/local/include/pgsql ] || [ -d /opt/pgsql/include ] || [ -f /usr/include/libpq-fe.h ] ; then echo "cdr_pgsql.so"; fi)
 267 -CFLAGS+=$(shell if [ -d /usr/local/pgsql/include ]; then echo "-I/usr/local/pgsql/include"; fi)
 268 -CFLAGS+=$(shell if [ -d /usr/include/pgsql ]; then echo "-I/usr/include/pgsql"; fi)
 269 -CFLAGS+=$(shell if [ -d /usr/include/postgresql ]; then echo "-I/usr/include/postgresql"; fi)
 270 -CFLAGS+=$(shell if [ -d /usr/local/include/pgsql ]; then echo "-I/usr/local/include/pgsql"; fi)
 271 -CFLAGS+=$(shell if [ -d /opt/pgsql/include ]; then echo "-I/opt/pgsql/include"; fi)
 272 -#CFLAGS+=$(shell if [ -f /usr/include/libpq-fe.h ]; then echo "-I/usr/include"; fi)
 273 +CFLAGS+=$(shell if [ -d ${STAGING_INCDIR}/pgsql ]; then echo "-I${STAGING_INCDIR}/pgsql"; fi)
 274 +CFLAGS+=$(shell if [ -d ${STAGING_INCDIR}/postgresql ]; then echo "-I${STAGING_INCDIR}/postgresql"; fi)
 275  MLFLAGS=
 276 -MLFLAGS+=$(shell if [ -d /usr/lib/pgsql ]; then echo "-L/usr/lib/pgsql"; fi)
 277 -MLFLAGS+=$(shell if [ -d /usr/local/pgsql/lib ]; then echo "-L/usr/local/pgsql/lib"; fi)
 278 -MLFLAGS+=$(shell if [ -d /usr/local/lib/pgsql ]; then echo "-L/usr/local/lib/pgsql"; fi)
 279 -MLFLAGS+=$(shell if [ -d /opt/pgsql/lib ]; then echo "-L/opt/pgsql/lib"; fi)
 280 -MLFLAGS+=$(shell if [ -f /usr/lib/libpq.so ]; then echo "-L/usr/lib"; fi)
 281 +MLFLAGS+=$(shell if [ -d ${STAGING_LIBDIR}/pgsql ]; then echo "-L${STAGING_LIBDIR}/pgsql"; fi)
 282
 283  #
 284  # SQLIte stuff...
 285  #
 286 -MODS+=$(shell if [ -f "/usr/include/sqlite.h" ]; then echo "cdr_sqlite.so"; fi)
 287 +MODS+=$(shell if [ -f "${STAGING_INCDIR}/sqlite.h" ]; then echo "cdr_sqlite.so"; fi)
 288
 289  all: depend $(MODS)
 290
 291 @@ -84,16 +73,16 @@
 292  endif
 293
 294  cdr_odbc.so: cdr_odbc.o
 295 -       $(CC) $(SOLINK) -o $@ $< -lodbc $(MLFLAGS)
 296 +       $(CC) $(SOLINK) -o $@ $< -lodbc $(LDFLAGS) $$(MLFLAGS)
 297
 298  cdr_tds.so: cdr_tds.o
 299 -       $(CC) $(SOLINK) -o $@ $< -ltds $(MLFLAGS)
 300 +       $(CC) $(SOLINK) -o $@ $< -ltds $(LDFLAGS) $$(MLFLAGS)
 301
 302  cdr_pgsql.so: cdr_pgsql.o
 303 -       $(CC) $(SOLINK) -o $@ $< -lpq -lz $(MLFLAGS)
 304 +       $(CC) $(SOLINK) -o $@ $< -lpq -lz $(LDFLAGS) $$(MLFLAGS)
 305
 306  cdr_sqlite.so: cdr_sqlite.o
 307 -       $(CC) $(SOLINK) -o $@ $< -lsqlite $(MLFLAGS)
 308 +       $(CC) $(SOLINK) -o $@ $< -lsqlite $(LDFLAGS) $(MLFLAGS)
 309
 310  depend: .depend
 311