3 # Patch managed by http://www.holgerschurig.de/patcher.html
6 --- asterisk-1.2.8/Makefile~makefile
7 +++ asterisk-1.2.8/Makefile
9 # Create OPTIONS variable
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)
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
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
36 SUBDIRS=res channels pbx apps codecs formats agi cdr funcs utils stdtime
41 ifeq ($(MAKETOPLEVEL),$(MAKELEVEL))
42 - CFLAGS+=$(ASTCFLAGS)
43 +override CFLAGS+=$(ASTCFLAGS)
46 # This is used when generating the doxygen documentation
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)
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
62 -OPTIMIZE+=-march=$(PROC)
63 +#OPTIMIZE+=-march=$(PROC)
69 ifneq ($(shell uname -m), parisc)
71 -GSM_SOURCES+= $(SRC)/k6opt.s
72 +#GSM_SOURCES+= $(SRC)/k6opt.s
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
85 --- asterisk-1.2.8/res/Makefile~makefile
86 +++ asterisk-1.2.8/res/Makefile
90 res_crypto.so: res_crypto.o
91 - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CRYPTO_LIBS)
92 + $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< $(LDFLAGS) ${CYGSOLIB} $(CRYPTO_LIBS)
95 rm -f *.so *.o .depend
96 --- asterisk-1.2.8/channels/Makefile~makefile
97 +++ asterisk-1.2.8/channels/Makefile
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
109 CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
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
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),)
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),)
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
138 endif # WITHOUT_ZAPTEL
140 -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vpbapi.h),)
141 +ifneq ($(wildcard $(STAGING_INCDIR)/vpbapi.h),)
142 CHANNEL_LIBS+=chan_vpb.so
149 -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/nbs.h),)
150 +ifneq ($(wildcard $(STAGING_INCDIR)/nbs.h),)
151 CHANNEL_LIBS+=chan_nbs.so
155 rm -f busy.h ringtone.h gentone gentone-ulaw
158 - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} ${LIBS}
159 + $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< $(LDFLAGS) ${CYGSOLIB} ${LIBS}
161 ifneq ($(wildcard .depend),)
163 --- asterisk-1.2.8/pbx/Makefile~makefile
164 +++ asterisk-1.2.8/pbx/Makefile
166 $(CC) $(SOLINK) -o $@ $(KDE_CONSOLE_OBJS) $(KDE_LIBS)
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)
174 --- asterisk-1.2.8/formats/Makefile~makefile
175 +++ asterisk-1.2.8/formats/Makefile
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
185 --- asterisk-1.2.8/utils/Makefile~makefile
186 +++ asterisk-1.2.8/utils/Makefile
189 TARGET=stereorize streamplayer
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),)
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),)