Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Tony Vroon (chainsaw)" <chainsaw@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/asterisk/files/1.6.1: asterisk-1.6.1-var_rundir.patch asterisk-1.6.1-gsm-pic.patch asterisk-1.6.1-uclibc.patch asterisk-1.6.1-parallelmake.patch asterisk-1.6.1-imap-kerberos.patch asterisk-1.6.1-toolcheck-libs-not-ldflags.patch
Date: Mon, 11 May 2009 17:47:58
Message-Id: E1M3ZbY-0001HK-Nb@stork.gentoo.org
1 chainsaw 09/05/11 17:47:56
2
3 Added: asterisk-1.6.1-var_rundir.patch
4 asterisk-1.6.1-gsm-pic.patch
5 asterisk-1.6.1-uclibc.patch
6 asterisk-1.6.1-parallelmake.patch
7 asterisk-1.6.1-imap-kerberos.patch
8 asterisk-1.6.1-toolcheck-libs-not-ldflags.patch
9 Log:
10 Actually add the patch files. Nice wildcard handling, CVS!
11 (Portage version: 2.1.6.13/cvs/Linux x86_64)
12
13 Revision Changes Path
14 1.1 net-misc/asterisk/files/1.6.1/asterisk-1.6.1-var_rundir.patch
15
16 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/asterisk/files/1.6.1/asterisk-1.6.1-var_rundir.patch?rev=1.1&view=markup
17 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/asterisk/files/1.6.1/asterisk-1.6.1-var_rundir.patch?rev=1.1&content-type=text/plain
18
19 Index: asterisk-1.6.1-var_rundir.patch
20 ===================================================================
21 --- asterisk-1.4.0/Makefile.orig 2006-12-24 03:07:19.000000000 +0000
22 +++ asterisk-1.4.0/Makefile 2006-12-24 03:07:57.000000000 +0000
23 @@ -109,7 +109,7 @@
24 ASTSBINDIR=$(sbindir)
25 ASTSPOOLDIR=$(localstatedir)/spool/asterisk
26 ASTLOGDIR=$(localstatedir)/log/asterisk
27 - ASTVARRUNDIR=$(localstatedir)/run
28 + ASTVARRUNDIR=$(localstatedir)/run/asterisk
29 ASTMANDIR=$(mandir)
30 ifeq ($(OSARCH),FreeBSD)
31 ASTVARLIBDIR=$(prefix)/share/asterisk
32
33
34
35 1.1 net-misc/asterisk/files/1.6.1/asterisk-1.6.1-gsm-pic.patch
36
37 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/asterisk/files/1.6.1/asterisk-1.6.1-gsm-pic.patch?rev=1.1&view=markup
38 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/asterisk/files/1.6.1/asterisk-1.6.1-gsm-pic.patch?rev=1.1&content-type=text/plain
39
40 Index: asterisk-1.6.1-gsm-pic.patch
41 ===================================================================
42 --- codecs/gsm/Makefile.org 2008-03-29 11:33:09.000000000 +0100
43 +++ codecs/gsm/Makefile 2008-03-29 11:44:40.000000000 +0100
44 @@ -37,23 +37,6 @@
45 ######### ppro's, etc, as well as the AMD K6 and K7. The compile will
46 ######### probably require gcc.
47
48 -ifeq (, $(findstring $(OSARCH) , Darwin SunOS ))
49 -ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm armv5b armeb ppc powerpc ppc64 ia64 s390 bfin mipsel mips))
50 -ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 ))
51 -OPTIMIZE+=-march=$(PROC)
52 -endif
53 -endif
54 -endif
55 -
56 -#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
57 -#This works for even old (2.96) versions of gcc and provides a small boost either way.
58 -#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn't support it.
59 -#So we go lowest common available by gcc and go a step down, still a step up from
60 -#the default as we now have a better instruction set to work with. - Belgarath
61 -ifeq ($(PROC),ultrasparc)
62 -OPTIMIZE+=-mcpu=v8 -mtune=$(PROC) -O3
63 -endif
64 -
65 PG =
66 #PG = -g -pg
67 ######### Profiling flags. If you don't know what that means, leave it blank.
68 @@ -208,12 +191,10 @@
69 # XXX Keep a space after each findstring argument
70 # XXX should merge with GSM_OBJECTS
71 ifeq ($(OSARCH),linux-gnu)
72 -ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
73 -ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel mips ))
74 +ifneq ($(K6OPT),)
75 GSM_SOURCES+= $(SRC)/k6opt.s
76 endif
77 endif
78 -endif
79
80 TOAST_SOURCES = $(SRC)/toast.c \
81 $(SRC)/toast_lin.c \
82 @@ -260,12 +241,10 @@
83 $(SRC)/table.o
84
85 ifeq ($(OSARCH),linux-gnu)
86 -ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
87 -ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel mips ))
88 +ifneq ($(K6OPT),)
89 GSM_OBJECTS+= $(SRC)/k6opt.o
90 endif
91 endif
92 -endif
93
94 TOAST_OBJECTS = $(SRC)/toast.o \
95 $(SRC)/toast_lin.o \
96
97
98
99 1.1 net-misc/asterisk/files/1.6.1/asterisk-1.6.1-uclibc.patch
100
101 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/asterisk/files/1.6.1/asterisk-1.6.1-uclibc.patch?rev=1.1&view=markup
102 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/asterisk/files/1.6.1/asterisk-1.6.1-uclibc.patch?rev=1.1&content-type=text/plain
103
104 Index: asterisk-1.6.1-uclibc.patch
105 ===================================================================
106 --- Makefile.old 2008-03-22 11:51:39.000000000 +0100
107 +++ Makefile 2008-03-22 11:51:49.000000000 +0100
108 @@ -259,6 +259,10 @@
109 ASTCFLAGS+=-pthread
110 endif
111
112 +ifeq ($(OSARCH),linux-uclibc)
113 + AST_LIBS+=-lpthread -ldl
114 +endif
115 +
116 ifeq ($(OSARCH),SunOS)
117 ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include -D_XPG4_2
118 endif
119
120
121
122 1.1 net-misc/asterisk/files/1.6.1/asterisk-1.6.1-parallelmake.patch
123
124 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/asterisk/files/1.6.1/asterisk-1.6.1-parallelmake.patch?rev=1.1&view=markup
125 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/asterisk/files/1.6.1/asterisk-1.6.1-parallelmake.patch?rev=1.1&content-type=text/plain
126
127 Index: asterisk-1.6.1-parallelmake.patch
128 ===================================================================
129 diff -uNr asterisk-1.6.1.0.ORIG/Makefile asterisk-1.6.1.0/Makefile
130 --- asterisk-1.6.1.0.ORIG/Makefile 2009-05-11 14:40:21.000000000 +0100
131 +++ asterisk-1.6.1.0/Makefile 2009-05-11 14:42:34.000000000 +0100
132 @@ -377,15 +377,15 @@
133 @echo "EMBED_LIBS+="`$(SILENTMAKE) -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
134
135 $(MOD_SUBDIRS_MENUSELECT_TREE):
136 - @$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) moduleinfo
137 - @$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) makeopts
138 + +@$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) moduleinfo
139 + +@$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) makeopts
140
141 makeopts.embed_rules: menuselect.makeopts
142 @echo "Generating embedded module rules ..."
143 @rm -f $@
144 - @$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDSCRIPT)
145 - @$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDFLAGS)
146 - @$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LIBS)
147 + +@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDSCRIPT)
148 + +@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDFLAGS)
149 + +@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LIBS)
150
151 $(SUBDIRS): main/version.c include/asterisk/version.h include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
152
153 @@ -408,10 +408,10 @@
154 endif
155
156 $(MOD_SUBDIRS):
157 - @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
158 + +@ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
159
160 $(OTHER_SUBDIRS):
161 - @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
162 + +@ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
163
164 defaults.h: makeopts
165 @build_tools/make_defaults_h > $@.tmp
166 @@ -439,10 +439,10 @@
167 @rm -f $@.tmp
168
169 $(SUBDIRS_CLEAN):
170 - @$(SUBMAKE) -C $(@:-clean=) clean
171 + +@$(SUBMAKE) -C $(@:-clean=) clean
172
173 $(SUBDIRS_DIST_CLEAN):
174 - @$(SUBMAKE) -C $(@:-dist-clean=) dist-clean
175 + +@$(SUBMAKE) -C $(@:-dist-clean=) dist-clean
176
177 clean: $(SUBDIRS_CLEAN) _clean
178
179 @@ -555,7 +555,7 @@
180 fi
181
182 $(SUBDIRS_INSTALL):
183 - @DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) install
184 + +@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) install
185
186 NEWMODS:=$(foreach d,$(MOD_SUBDIRS),$(notdir $(wildcard $(d)/*.so)))
187 OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
188 @@ -804,7 +804,7 @@
189 @cmp -s .cleancount .lastclean || $(MAKE) clean
190
191 $(SUBDIRS_UNINSTALL):
192 - @$(SUBMAKE) -C $(@:-uninstall=) uninstall
193 + +@$(SUBMAKE) -C $(@:-uninstall=) uninstall
194
195 _uninstall: $(SUBDIRS_UNINSTALL)
196 rm -f $(DESTDIR)$(MODULES_DIR)/*
197 @@ -850,7 +850,7 @@
198 nmenuconfig: nmenuselect
199
200 menuselect: menuselect/cmenuselect menuselect/nmenuselect menuselect/gmenuselect
201 - @if [ -x menuselect/nmenuselect ]; then \
202 + +@if [ -x menuselect/nmenuselect ]; then \
203 $(MAKE) nmenuselect; \
204 elif [ -x menuselect/cmenuselect ]; then \
205 $(MAKE) cmenuselect; \
206 @@ -875,28 +875,28 @@
207 MAKE_MENUSELECT=CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
208
209 menuselect/menuselect: menuselect/makeopts
210 - $(MAKE_MENUSELECT) menuselect
211 + +$(MAKE_MENUSELECT) menuselect
212
213 menuselect/cmenuselect: menuselect/makeopts
214 - $(MAKE_MENUSELECT) cmenuselect
215 + +$(MAKE_MENUSELECT) cmenuselect
216
217 menuselect/gmenuselect: menuselect/makeopts
218 - $(MAKE_MENUSELECT) gmenuselect
219 + +$(MAKE_MENUSELECT) gmenuselect
220
221 menuselect/nmenuselect: menuselect/makeopts
222 - $(MAKE_MENUSELECT) nmenuselect
223 + +$(MAKE_MENUSELECT) nmenuselect
224
225 menuselect/makeopts: makeopts
226 - $(MAKE_MENUSELECT) makeopts
227 + +$(MAKE_MENUSELECT) makeopts
228
229 menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml build_tools/cflags-devmode.xml sounds/sounds.xml build_tools/embed_modules.xml configure
230 @echo "Generating input for menuselect ..."
231 @echo "<?xml version=\"1.0\"?>" > $@
232 @echo >> $@
233 @echo "<menu name=\"Asterisk Module and Build Option Selection\">" >> $@
234 - @for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SILENTMAKE) -C $${dir} SUBDIR=$${dir} moduleinfo >> $@; done
235 + +@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SILENTMAKE) -C $${dir} SUBDIR=$${dir} moduleinfo >> $@; done
236 @cat build_tools/cflags.xml >> $@
237 - @for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SILENTMAKE) -C $${dir} SUBDIR=$${dir} makeopts >> $@; done
238 + +@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SILENTMAKE) -C $${dir} SUBDIR=$${dir} makeopts >> $@; done
239 @if [ "${AST_DEVMODE}" = "yes" ]; then \
240 cat build_tools/cflags-devmode.xml >> $@; \
241 fi
242
243
244
245 1.1 net-misc/asterisk/files/1.6.1/asterisk-1.6.1-imap-kerberos.patch
246
247 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/asterisk/files/1.6.1/asterisk-1.6.1-imap-kerberos.patch?rev=1.1&view=markup
248 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/asterisk/files/1.6.1/asterisk-1.6.1-imap-kerberos.patch?rev=1.1&content-type=text/plain
249
250 Index: asterisk-1.6.1-imap-kerberos.patch
251 ===================================================================
252 diff -uNr asterisk-1.6.0.6.ORIG/configure.ac asterisk-1.6.0.6/configure.ac
253 --- asterisk-1.6.0.6.ORIG/configure.ac 2009-03-10 23:00:03.000000000 +0000
254 +++ asterisk-1.6.0.6/configure.ac 2009-03-10 22:58:59.000000000 +0000
255 @@ -720,8 +720,11 @@
256 fi
257 imap_libs="${IMAP_TK_DIR}/c-client/c-client.a"
258 imap_include="-I${IMAP_TK_DIR}/c-client"
259 - CPPFLAGS="${CPPFLAGS} ${imap_include}"
260 - LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}`
261 + CPPFLAGS="${CPPFLAGS} -I/usr/include/imap"
262 + LIBS="${LIBS} /usr/lib/c-client.a -lssl -lpam"
263 + if test -f /usr/bin/krb5-config; then
264 + LIBS="${LIBS} "`/usr/bin/krb5-config --libs krb5 gssapi kadm-client kadm-server`
265 + fi
266 AC_LINK_IFELSE(
267 AC_LANG_PROGRAM(
268 [#include "c-client.h"
269
270
271
272 1.1 net-misc/asterisk/files/1.6.1/asterisk-1.6.1-toolcheck-libs-not-ldflags.patch
273
274 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/asterisk/files/1.6.1/asterisk-1.6.1-toolcheck-libs-not-ldflags.patch?rev=1.1&view=markup
275 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/asterisk/files/1.6.1/asterisk-1.6.1-toolcheck-libs-not-ldflags.patch?rev=1.1&content-type=text/plain
276
277 Index: asterisk-1.6.1-toolcheck-libs-not-ldflags.patch
278 ===================================================================
279 diff -uNr asterisk-1.6.0.6.ORIG/autoconf/ast_ext_tool_check.m4 asterisk-1.6.0.6/autoconf/ast_ext_tool_check.m4
280 --- asterisk-1.6.0.6.ORIG/autoconf/ast_ext_tool_check.m4 2009-03-16 13:17:33.000000000 +0000
281 +++ asterisk-1.6.0.6/autoconf/ast_ext_tool_check.m4 2009-03-16 13:18:26.000000000 +0000
282 @@ -20,8 +20,8 @@
283 fi
284 CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE}"
285
286 - saved_ldflags="${LDFLAGS}"
287 - LDFLAGS="${$1_LIB}"
288 + saved_libs="${LIBS}"
289 + LIBS="${$1_LIB}"
290
291 AC_LINK_IFELSE(
292 [ AC_LANG_PROGRAM( [ $5 ],
293 @@ -33,7 +33,7 @@
294 []
295 )
296 CPPFLAGS="${saved_cppflags}"
297 - LDFLAGS="${saved_ldflags}"
298 + LIBS="${saved_libs}"
299 else
300 PBX_$1=1
301 AC_DEFINE([HAVE_$1], 1, [Define if your system has the $1 libraries.])
Report Message
Find on MARC Find on Google Groups