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

   1
   2 #
   3 # Patch managed by http://www.holgerschurig.de/patcher.html
   4 #
   5
   6 --- asterisk-1.2.8/Makefile~makefile
   7 +++ asterisk-1.2.8/Makefile
   8 @@ -16,6 +16,9 @@
   9  # Create OPTIONS variable
  10  OPTIONS=
  11  # If cross compiling, define these to suit
  12 +CROSS_COMPILE=$(CROSS_DIR)
  13 +CROSS_COMPILE_TARGET=$(STAGING_DIR)
  14 +CROSS_COMPILE_BIN=$(STAGING_BINDIR_CROSS)
  15  # CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be-
  16  # CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/
  17  # CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target
  18 @@ -327,13 +330,13 @@
  19    endif
  20  endif
  21
  22 -ASTCFLAGS+= $(DEBUG_THREADS)
  23 -ASTCFLAGS+= $(TRACE_FRAMES)
  24 -ASTCFLAGS+= $(MALLOC_DEBUG)
  25 -ASTCFLAGS+= $(BUSYDETECT)
  26 -ASTCFLAGS+= $(OPTIONS)
  27 +#ASTCFLAGS+= $(DEBUG_THREADS)
  28 +#ASTCFLAGS+= $(TRACE_FRAMES)
  29 +#ASTCFLAGS+= $(MALLOC_DEBUG)
  30 +#ASTCFLAGS+= $(BUSYDETECT)
  31 +#ASTCFLAGS+= $(OPTIONS)
  32  ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize)
  33 -ASTCFLAGS+= -fomit-frame-pointer
  34 +#ASTCFLAGS+= -fomit-frame-pointer
  35  endif
  36  SUBDIRS=res channels pbx apps codecs formats agi cdr funcs utils stdtime
  37
  38 @@ -397,7 +400,7 @@
  39  endif
  40
  41  ifeq ($(MAKETOPLEVEL),$(MAKELEVEL))
  42 -  CFLAGS+=$(ASTCFLAGS)
  43 +override CFLAGS+=$(ASTCFLAGS)
  44  endif
  45
  46  # This is used when generating the doxygen documentation
  47 @@ -519,7 +522,7 @@
  48         fi
  49         rm -f include/asterisk/build.h.tmp
  50         $(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c
  51 -       $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS)
  52 +       $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LDFLAGS) $(LIBS)
  53
  54  muted: muted.o
  55         $(CC) $(AUDIO_LIBS) -o muted muted.o
  56 --- asterisk-1.2.8/codecs/gsm/Makefile~makefile
  57 +++ asterisk-1.2.8/codecs/gsm/Makefile
  58 @@ -51,7 +51,7 @@
  59             ifneq (${PROC},ppc)
  60              ifneq (${PROC},ppc64)
  61               ifneq (${PROC},s390)
  62 -OPTIMIZE+=-march=$(PROC)
  63 +#OPTIMIZE+=-march=$(PROC)
  64               endif
  65              endif
  66             endif
  67 @@ -243,7 +243,7 @@
  68  ifneq (${PROC},arm)
  69  ifneq ($(shell uname -m), parisc)
  70  ifneq (${PROC}, s390)
  71 -GSM_SOURCES+= $(SRC)/k6opt.s
  72 +#GSM_SOURCES+= $(SRC)/k6opt.s
  73  endif
  74  endif
  75  endif
  76 @@ -309,7 +309,7 @@
  77  ifneq ($(shell uname -m), sparc64)
  78  ifneq ($(shell uname -m), armv4l)
  79  ifneq ($(shell uname -m), parisc)
  80 -GSM_OBJECTS+= $(SRC)/k6opt.o
  81 +#GSM_OBJECTS+= $(SRC)/k6opt.o
  82  endif
  83  endif
  84  endif
  85 --- asterisk-1.2.8/res/Makefile~makefile
  86 +++ asterisk-1.2.8/res/Makefile
  87 @@ -89,7 +89,7 @@
  88         fi
  89
  90  res_crypto.so: res_crypto.o
  91 -       $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CRYPTO_LIBS)
  92 +       $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< $(LDFLAGS) ${CYGSOLIB} $(CRYPTO_LIBS)
  93
  94  clean:
  95         rm -f *.so *.o .depend
  96 --- asterisk-1.2.8/channels/Makefile~makefile
  97 +++ asterisk-1.2.8/channels/Makefile
  98 @@ -73,7 +73,7 @@
  99    SOLINK+=-lrt
 100  endif
 101
 102 -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),)
 103 +ifneq ($(wildcard $(STAGING_INCDIR)/linux/ixjuser.h),)
 104    CHANNEL_LIBS+=chan_phone.so
 105  endif
 106
 107 @@ -88,16 +88,16 @@
 108
 109  CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
 110
 111 -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/alsa/asoundlib.h),)
 112 +ifneq ($(wildcard $(STAGING_INCDIR)/alsa/asoundlib.h),)
 113    CHANNEL_LIBS+=chan_alsa.so
 114  endif
 115
 116 -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),)
 117 +ifneq ($(wildcard $(STAGING_LIBDIR)/libpri.so.1),)
 118    CFLAGS+=-DZAPATA_PRI
 119    ZAPPRI=-lpri
 120  endif
 121
 122 -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),)
 123 +ifneq ($(wildcard $(STAGING_LIBDIR)/libmfcr2.so.1),)
 124    CFLAGS+=-DZAPATA_R2
 125    ZAPR2=-lmfcr2
 126  endif
 127 @@ -110,7 +110,7 @@
 128  endif
 129
 130  ifndef WITHOUT_ZAPTEL
 131 -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
 132 +ifneq ($(wildcard $(STAGING_INCDIR)/linux/zaptel.h),)
 133    ifeq (${OSARCH},NetBSD)
 134      SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib
 135    endif
 136 @@ -122,7 +122,7 @@
 137  endif
 138  endif # WITHOUT_ZAPTEL
 139
 140 -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vpbapi.h),)
 141 +ifneq ($(wildcard $(STAGING_INCDIR)/vpbapi.h),)
 142    CHANNEL_LIBS+=chan_vpb.so
 143    CFLAGS+=-DLINUX
 144  endif
 145 @@ -137,7 +137,7 @@
 146
 147  ZAPDIR=/usr/lib
 148
 149 -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/nbs.h),)
 150 +ifneq ($(wildcard $(STAGING_INCDIR)/nbs.h),)
 151    CHANNEL_LIBS+=chan_nbs.so
 152  endif
 153
 154 @@ -158,7 +158,7 @@
 155         rm -f busy.h ringtone.h gentone gentone-ulaw
 156
 157  %.so : %.o
 158 -       $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} ${LIBS}
 159 +       $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< $(LDFLAGS) ${CYGSOLIB} ${LIBS}
 160
 161  ifneq ($(wildcard .depend),)
 162    include .depend
 163 --- asterisk-1.2.8/pbx/Makefile~makefile
 164 +++ asterisk-1.2.8/pbx/Makefile
 165 @@ -59,7 +59,7 @@
 166         $(CC) $(SOLINK) -o $@ $(KDE_CONSOLE_OBJS) $(KDE_LIBS)
 167
 168  pbx_dundi.so: dundi-parser.o pbx_dundi.o
 169 -       $(CC) $(SOLINK) -o $@ ${CYGSOLINK} pbx_dundi.o dundi-parser.o -lz ${CYGSOLIB}
 170 +       $(CC) $(SOLINK) -o $@ ${CYGSOLINK} pbx_dundi.o dundi-parser.o -lz ${CYGSOLIB} $(LDFLAGS)
 171
 172  %.moc : %.h
 173         $(MOC) $< -o $@
 174 --- asterisk-1.2.8/formats/Makefile~makefile
 175 +++ asterisk-1.2.8/formats/Makefile
 176 @@ -25,7 +25,7 @@
 177  #
 178  # OGG/Vorbis format
 179  #
 180 -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vorbis/codec.h),)
 181 +ifneq ($(wildcard $(STAGING_INCDIR)/vorbis/codec.h),)
 182    FORMAT_LIBS+=format_ogg_vorbis.so
 183  endif
 184
 185 --- asterisk-1.2.8/utils/Makefile~makefile
 186 +++ asterisk-1.2.8/utils/Makefile
 187 @@ -22,11 +22,11 @@
 188
 189  TARGET=stereorize streamplayer
 190
 191 -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/popt.h),)
 192 +ifneq ($(wildcard $(STAGING_INCDIR)/popt.h),)
 193    TARGET+=smsq
 194  endif
 195
 196 -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/newt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/newt.h),)
 197 +ifneq ($(wildcard $(STAGING_INCDIR)/newt.h),)
 198    TARGET+=astman
 199  endif
 200