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