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-addons/files: asterisk-addons-1.6.1.2-uclibc.diff asterisk-addons-1.6.1.2-parallel-make.diff
Date: Wed, 02 Dec 2009 18:45:30
Message-Id: E1NFuCd-0002NA-9W@stork.gentoo.org
1 chainsaw 09/12/02 18:45:27
2
3 Added: asterisk-addons-1.6.1.2-uclibc.diff
4 asterisk-addons-1.6.1.2-parallel-make.diff
5 Log:
6 Version bump. Robustness fixes for the MP3 support, the MySQL module has also recieved some love.
7 (Portage version: 2.1.7.9/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 net-misc/asterisk-addons/files/asterisk-addons-1.6.1.2-uclibc.diff
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/asterisk-addons/files/asterisk-addons-1.6.1.2-uclibc.diff?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/asterisk-addons/files/asterisk-addons-1.6.1.2-uclibc.diff?rev=1.1&content-type=text/plain
14
15 Index: asterisk-addons-1.6.1.2-uclibc.diff
16 ===================================================================
17 diff -uNr asterisk-addons-1.6.1.2.ORIG/cdr/cdr_addon_mysql.c asterisk-addons-1.6.1.2/cdr/cdr_addon_mysql.c
18 --- asterisk-addons-1.6.1.2.ORIG/cdr/cdr_addon_mysql.c 2009-12-02 18:35:01.000000000 +0000
19 +++ asterisk-addons-1.6.1.2/cdr/cdr_addon_mysql.c 2009-12-02 18:36:00.000000000 +0000
20 @@ -29,6 +29,13 @@
21
22 #include <asterisk.h>
23
24 +#include <stdio.h>
25 +#include <string.h>
26 +
27 +#include <stdlib.h>
28 +#include <unistd.h>
29 +#include <time.h>
30 +
31 #include <sys/types.h>
32 #include <asterisk/config.h>
33 #include <asterisk/options.h>
34 @@ -40,13 +47,6 @@
35 #include <asterisk/strings.h>
36 #include <asterisk/linkedlists.h>
37
38 -#include <stdio.h>
39 -#include <string.h>
40 -
41 -#include <stdlib.h>
42 -#include <unistd.h>
43 -#include <time.h>
44 -
45 #include <mysql/mysql.h>
46 #include <mysql/errmsg.h>
47
48 diff -uNr asterisk-addons-1.6.1.2.ORIG/res/res_config_mysql.c asterisk-addons-1.6.1.2/res/res_config_mysql.c
49 --- asterisk-addons-1.6.1.2.ORIG/res/res_config_mysql.c 2009-12-02 18:35:01.000000000 +0000
50 +++ asterisk-addons-1.6.1.2/res/res_config_mysql.c 2009-12-02 18:36:00.000000000 +0000
51 @@ -44,6 +44,9 @@
52
53 #include <asterisk.h>
54
55 +#include <stdlib.h>
56 +#include <stdio.h>
57 +#include <string.h>
58 #include <asterisk/channel.h>
59 #include <asterisk/logger.h>
60 #include <asterisk/config.h>
61 @@ -53,10 +56,6 @@
62 #include <asterisk/cli.h>
63 #include <asterisk/utils.h>
64 #include <asterisk/threadstorage.h>
65 -#include <stdlib.h>
66 -#include <stdio.h>
67 -#include <string.h>
68 -#include <stdio.h>
69 #include <sys/types.h>
70 #include <sys/stat.h>
71 #include <unistd.h>
72
73
74
75 1.1 net-misc/asterisk-addons/files/asterisk-addons-1.6.1.2-parallel-make.diff
76
77 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/asterisk-addons/files/asterisk-addons-1.6.1.2-parallel-make.diff?rev=1.1&view=markup
78 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/asterisk-addons/files/asterisk-addons-1.6.1.2-parallel-make.diff?rev=1.1&content-type=text/plain
79
80 Index: asterisk-addons-1.6.1.2-parallel-make.diff
81 ===================================================================
82 diff -uNr asterisk-addons-1.6.1.2.ORIG/Makefile asterisk-addons-1.6.1.2/Makefile
83 --- asterisk-addons-1.6.1.2.ORIG/Makefile 2009-12-02 18:32:26.000000000 +0000
84 +++ asterisk-addons-1.6.1.2/Makefile 2009-12-02 18:33:00.000000000 +0000
85 @@ -136,8 +136,8 @@
86 @echo "EMBED_LIBS+="`$(SILENTMAKE) -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
87
88 $(MOD_SUBDIRS_MENUSELECT_TREE):
89 - @$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) moduleinfo
90 - @$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) makeopts
91 + +@$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) moduleinfo
92 + +@$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) makeopts
93
94 makeopts.embed_rules: menuselect.makeopts
95 @echo "Generating embedded module rules ..."
96 @@ -149,10 +149,10 @@
97 $(SUBDIRS): makeopts.embed_rules
98
99 $(MOD_SUBDIRS):
100 - @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) $(PRINT_DIR) --no-builtin-rules -C $@ SUBDIR=$@ all
101 + +@ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) $(PRINT_DIR) --no-builtin-rules -C $@ SUBDIR=$@ all
102
103 $(OTHER_SUBDIRS):
104 - @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) $(PRINT_DIR) --no-builtin-rules -C $@ SUBDIR=$@ all
105 + +@ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) $(PRINT_DIR) --no-builtin-rules -C $@ SUBDIR=$@ all
106
107 config.status: configure
108 @./configure
109 @@ -269,27 +269,27 @@
110 MAKE_MENUSELECT=CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
111
112 menuselect/menuselect: menuselect/makeopts
113 - $(MAKE_MENUSELECT) menuselect
114 + +$(MAKE_MENUSELECT) menuselect
115
116 menuselect/cmenuselect: menuselect/makeopts
117 - $(MAKE_MENUSELECT) cmenuselect
118 + +$(MAKE_MENUSELECT) cmenuselect
119
120 menuselect/gmenuselect: menuselect/makeopts
121 - $(MAKE_MENUSELECT) gmenuselect
122 + +$(MAKE_MENUSELECT) gmenuselect
123
124 menuselect/nmenuselect: menuselect/makeopts
125 - $(MAKE_MENUSELECT) nmenuselect
126 + +$(MAKE_MENUSELECT) nmenuselect
127
128 menuselect/makeopts: makeopts
129 - $(MAKE_MENUSELECT) makeopts
130 + +$(MAKE_MENUSELECT) makeopts
131
132 menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) configure
133 @echo "Generating input for menuselect ..."
134 @echo "<?xml version=\"1.0\"?>" > $@
135 @echo >> $@
136 @echo "<menu name=\"Asterisk-addons Module Selection\">" >> $@
137 - @for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} moduleinfo >> $@; done
138 - @for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} makeopts >> $@; done
139 + +@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} moduleinfo >> $@; done
140 + +@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} makeopts >> $@; done
141 @echo "</menu>" >> $@
142
143 .PHONY: menuselect clean dist-clean distclean all cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS)
Report Message
Find on MARC Find on Google Groups