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.2.0-respect-destdir.diff asterisk-addons-1.6.2.0-uclibc.diff asterisk-addons-1.6.2.0-parallel-make.diff asterisk-addons-1.6.1.1-parallel-make.diff asterisk-addons-1.6.1.1-uclibc.diff
Date: Fri, 19 Feb 2010 15:57:26
Message-Id: E1NiV5Q-0006KA-95@stork.gentoo.org
1 chainsaw 10/02/19 15:48:12
2
3 Added: asterisk-addons-1.6.2.0-respect-destdir.diff
4 asterisk-addons-1.6.2.0-uclibc.diff
5 asterisk-addons-1.6.2.0-parallel-make.diff
6 Removed: asterisk-addons-1.6.1.1-parallel-make.diff
7 asterisk-addons-1.6.1.1-uclibc.diff
8 Log:
9 Version bump to 1.6.2 branch. Clarify 1.6.1 branch dependencies. Remove old ebuild.
10 (Portage version: 2.1.7.17/cvs/Linux x86_64)
11
12 Revision Changes Path
13 1.1 net-misc/asterisk-addons/files/asterisk-addons-1.6.2.0-respect-destdir.diff
14
15 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/asterisk-addons/files/asterisk-addons-1.6.2.0-respect-destdir.diff?rev=1.1&view=markup
16 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/asterisk-addons/files/asterisk-addons-1.6.2.0-respect-destdir.diff?rev=1.1&content-type=text/plain
17
18 Index: asterisk-addons-1.6.2.0-respect-destdir.diff
19 ===================================================================
20 diff -uNr asterisk-addons-1.6.2.0.ORIG//Makefile asterisk-addons-1.6.2.0/Makefile
21 --- asterisk-addons-1.6.2.0.ORIG//Makefile 2010-02-19 15:06:46.000000000 +0000
22 +++ asterisk-addons-1.6.2.0/Makefile 2010-02-19 15:07:50.000000000 +0000
23 @@ -185,7 +185,8 @@
24
25 install-xmldoc: doc/addons-en_US.xml
26 @echo "Installing XML documentation"
27 - @$(INSTALL) -m 644 doc/addons-*.xml $(ASTDATADIR)/documentation
28 + @mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation
29 + @$(INSTALL) -m 644 doc/addons-*.xml $(DESTDIR)$(ASTDATADIR)/documentation
30
31 cleantest:
32
33
34
35
36 1.1 net-misc/asterisk-addons/files/asterisk-addons-1.6.2.0-uclibc.diff
37
38 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/asterisk-addons/files/asterisk-addons-1.6.2.0-uclibc.diff?rev=1.1&view=markup
39 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/asterisk-addons/files/asterisk-addons-1.6.2.0-uclibc.diff?rev=1.1&content-type=text/plain
40
41 Index: asterisk-addons-1.6.2.0-uclibc.diff
42 ===================================================================
43 diff -uNr asterisk-addons-1.6.2.0.ORIG//cdr/cdr_addon_mysql.c asterisk-addons-1.6.2.0/cdr/cdr_addon_mysql.c
44 --- asterisk-addons-1.6.2.0.ORIG//cdr/cdr_addon_mysql.c 2010-02-19 15:11:40.000000000 +0000
45 +++ asterisk-addons-1.6.2.0/cdr/cdr_addon_mysql.c 2010-02-19 15:12:01.000000000 +0000
46 @@ -29,6 +29,13 @@
47
48 #include <asterisk.h>
49
50 +#include <stdio.h>
51 +#include <string.h>
52 +
53 +#include <stdlib.h>
54 +#include <unistd.h>
55 +#include <time.h>
56 +
57 #include <sys/types.h>
58 #include <asterisk/config.h>
59 #include <asterisk/options.h>
60 @@ -41,13 +48,6 @@
61 #include <asterisk/linkedlists.h>
62 #include <asterisk/threadstorage.h>
63
64 -#include <stdio.h>
65 -#include <string.h>
66 -
67 -#include <stdlib.h>
68 -#include <unistd.h>
69 -#include <time.h>
70 -
71 #include <mysql/mysql.h>
72 #include <mysql/errmsg.h>
73
74 diff -uNr asterisk-addons-1.6.2.0.ORIG//res/res_config_mysql.c asterisk-addons-1.6.2.0/res/res_config_mysql.c
75 --- asterisk-addons-1.6.2.0.ORIG//res/res_config_mysql.c 2010-02-19 15:11:40.000000000 +0000
76 +++ asterisk-addons-1.6.2.0/res/res_config_mysql.c 2010-02-19 15:12:01.000000000 +0000
77 @@ -44,6 +44,9 @@
78
79 #include <asterisk.h>
80
81 +#include <stdlib.h>
82 +#include <stdio.h>
83 +#include <string.h>
84 #include <asterisk/channel.h>
85 #include <asterisk/logger.h>
86 #include <asterisk/config.h>
87 @@ -53,10 +56,6 @@
88 #include <asterisk/cli.h>
89 #include <asterisk/utils.h>
90 #include <asterisk/threadstorage.h>
91 -#include <stdlib.h>
92 -#include <stdio.h>
93 -#include <string.h>
94 -#include <stdio.h>
95 #include <sys/types.h>
96 #include <sys/stat.h>
97 #include <unistd.h>
98
99
100
101 1.1 net-misc/asterisk-addons/files/asterisk-addons-1.6.2.0-parallel-make.diff
102
103 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/asterisk-addons/files/asterisk-addons-1.6.2.0-parallel-make.diff?rev=1.1&view=markup
104 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/asterisk-addons/files/asterisk-addons-1.6.2.0-parallel-make.diff?rev=1.1&content-type=text/plain
105
106 Index: asterisk-addons-1.6.2.0-parallel-make.diff
107 ===================================================================
108 diff -uNr asterisk-addons-1.6.2.0.ORIG/Makefile asterisk-addons-1.6.2.0/Makefile
109 --- asterisk-addons-1.6.2.0.ORIG/Makefile 2010-01-27 11:10:32.000000000 +0000
110 +++ asterisk-addons-1.6.2.0/Makefile 2010-01-27 11:10:53.000000000 +0000
111 @@ -146,8 +146,8 @@
112 @echo "EMBED_LIBS+="`$(SILENTMAKE) -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
113
114 $(MOD_SUBDIRS_MENUSELECT_TREE):
115 - @$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) moduleinfo
116 - @$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) makeopts
117 + +@$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) moduleinfo
118 + +@$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) makeopts
119
120 makeopts.embed_rules: menuselect.makeopts
121 @echo "Generating embedded module rules ..."
122 @@ -306,27 +306,27 @@
123 MAKE_MENUSELECT=CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
124
125 menuselect/menuselect: menuselect/makeopts
126 - $(MAKE_MENUSELECT) menuselect
127 + +$(MAKE_MENUSELECT) menuselect
128
129 menuselect/cmenuselect: menuselect/makeopts
130 - $(MAKE_MENUSELECT) cmenuselect
131 + +$(MAKE_MENUSELECT) cmenuselect
132
133 menuselect/gmenuselect: menuselect/makeopts
134 - $(MAKE_MENUSELECT) gmenuselect
135 + +$(MAKE_MENUSELECT) gmenuselect
136
137 menuselect/nmenuselect: menuselect/makeopts
138 - $(MAKE_MENUSELECT) nmenuselect
139 + +$(MAKE_MENUSELECT) nmenuselect
140
141 menuselect/makeopts: makeopts
142 - $(MAKE_MENUSELECT) makeopts
143 + +$(MAKE_MENUSELECT) makeopts
144
145 menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) configure
146 @echo "Generating input for menuselect ..."
147 @echo "<?xml version=\"1.0\"?>" > $@
148 @echo >> $@
149 @echo "<menu name=\"Asterisk-addons Module Selection\">" >> $@
150 - @for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} moduleinfo >> $@; done
151 - @for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} makeopts >> $@; done
152 + +@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} moduleinfo >> $@; done
153 + +@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} makeopts >> $@; done
154 @echo "</menu>" >> $@
155
156 .PHONY: menuselect clean dist-clean distclean all cleantest install-xmldoc 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