[gentoo-commits] repo/gentoo:master commit in: net-misc/asterisk/ - gentoo-commits

From:	Sam James <sam@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: net-misc/asterisk/
Date:	Thu, 18 Aug 2022 21:01:57
Message-Id:	`1660856499.a8798b7bd83135647851684f6bf1cd8e1322040c.sam@gentoo`

1

commit:     a8798b7bd83135647851684f6bf1cd8e1322040c

2

Author:     Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za>

3

AuthorDate: Thu Aug 18 20:46:10 2022 +0000

4

Commit:     Sam James <sam <AT> gentoo <DOT> org>

5

CommitDate: Thu Aug 18 21:01:39 2022 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8798b7b

7

8

net-misc/asterisk: ./configure fixes.

9

10

1.  there is a ./configure in menuselect, so eautoreconf should run

11

    there too.

12

2.  SED= is set in that menuselect/configure only after using, resulting

13

    in "./configure: line 5027: -e: command not found", which ends up

14

    that libxml-2.0 is detected, but the CFLAGS for the package isn't

15

    correctly set, resulting in failure at a later stage to #include

16

    <libxml/parser.h>

17

18

Package-Manager: Portage-3.0.30, Repoman-3.0.3

19

Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za>

20

Closes: https://github.com/gentoo/gentoo/pull/26916

21

Signed-off-by: Sam James <sam <AT> gentoo.org>

22

23

 net-misc/asterisk/asterisk-13.38.3-r3.ebuild | 3 ++-

24

 net-misc/asterisk/asterisk-16.22.0-r1.ebuild | 3 ++-

25

 net-misc/asterisk/asterisk-16.23.0-r1.ebuild | 3 ++-

26

 net-misc/asterisk/asterisk-16.24.0-r1.ebuild | 3 ++-

27

 net-misc/asterisk/asterisk-16.26.1.ebuild    | 4 +++-

28

 net-misc/asterisk/asterisk-16.27.0.ebuild    | 4 +++-

29

 net-misc/asterisk/asterisk-18.10.0-r1.ebuild | 3 ++-

30

 net-misc/asterisk/asterisk-18.13.0.ebuild    | 3 ++-

31

 net-misc/asterisk/asterisk-18.8.0-r1.ebuild  | 3 ++-

32

 net-misc/asterisk/asterisk-18.9.0-r1.ebuild  | 3 ++-

33

 10 files changed, 22 insertions(+), 10 deletions(-)

34

35

diff --git a/net-misc/asterisk/asterisk-13.38.3-r3.ebuild b/net-misc/asterisk/asterisk-13.38.3-r3.ebuild

36

index f751e394bb25..2bd6004948b9 100644

37

--- a/net-misc/asterisk/asterisk-13.38.3-r3.ebuild

38

+++ b/net-misc/asterisk/asterisk-13.38.3-r3.ebuild

39

@@ -139,7 +139,8 @@ pkg_setup() {

40

41

 src_prepare() {

42

 	default

43

-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf

44

+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \

45

+		AC_CONFIG_SUBDIRS=menuselect eautoreconf

46

}

47

48

 src_configure() {

49

50

diff --git a/net-misc/asterisk/asterisk-16.22.0-r1.ebuild b/net-misc/asterisk/asterisk-16.22.0-r1.ebuild

51

index d93cebbd447b..b4d9db65f36e 100644

52

--- a/net-misc/asterisk/asterisk-16.22.0-r1.ebuild

53

+++ b/net-misc/asterisk/asterisk-16.22.0-r1.ebuild

54

@@ -140,7 +140,8 @@ pkg_setup() {

55

56

 src_prepare() {

57

 	default

58

-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf

59

+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \

60

+		AC_CONFIG_SUBDIRS=menuselect eautoreconf

61

}

62

63

 src_configure() {

64

65

diff --git a/net-misc/asterisk/asterisk-16.23.0-r1.ebuild b/net-misc/asterisk/asterisk-16.23.0-r1.ebuild

66

index b1734d7ddad9..5651421ddd25 100644

67

--- a/net-misc/asterisk/asterisk-16.23.0-r1.ebuild

68

+++ b/net-misc/asterisk/asterisk-16.23.0-r1.ebuild

69

@@ -140,7 +140,8 @@ pkg_setup() {

70

71

 src_prepare() {

72

 	default

73

-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf

74

+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \

75

+		AC_CONFIG_SUBDIRS=menuselect eautoreconf

76

}

77

78

 src_configure() {

79

80

diff --git a/net-misc/asterisk/asterisk-16.24.0-r1.ebuild b/net-misc/asterisk/asterisk-16.24.0-r1.ebuild

81

index b1734d7ddad9..5651421ddd25 100644

82

--- a/net-misc/asterisk/asterisk-16.24.0-r1.ebuild

83

+++ b/net-misc/asterisk/asterisk-16.24.0-r1.ebuild

84

@@ -140,7 +140,8 @@ pkg_setup() {

85

86

 src_prepare() {

87

 	default

88

-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf

89

+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \

90

+		AC_CONFIG_SUBDIRS=menuselect eautoreconf

91

}

92

93

 src_configure() {

94

95

diff --git a/net-misc/asterisk/asterisk-16.26.1.ebuild b/net-misc/asterisk/asterisk-16.26.1.ebuild

96

index a2765b2dde1f..357286071693 100644

97

--- a/net-misc/asterisk/asterisk-16.26.1.ebuild

98

+++ b/net-misc/asterisk/asterisk-16.26.1.ebuild

99

@@ -140,7 +140,8 @@ pkg_setup() {

100

101

 src_prepare() {

102

 	default

103

-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf

104

+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \

105

+		AC_CONFIG_SUBDIRS=menuselect eautoreconf

106

}

107

108

 src_configure() {

109

@@ -148,6 +149,7 @@ src_configure() {

110

 	local copt cstate

111

112

 	econf \

113

+		SED=sed \

114

 		LUA_VERSION="${ELUA#lua}" \

115

 		--libdir="/usr/$(get_libdir)" \

116

 		--localstatedir="/var" \

117

118

diff --git a/net-misc/asterisk/asterisk-16.27.0.ebuild b/net-misc/asterisk/asterisk-16.27.0.ebuild

119

index a2765b2dde1f..357286071693 100644

120

--- a/net-misc/asterisk/asterisk-16.27.0.ebuild

121

+++ b/net-misc/asterisk/asterisk-16.27.0.ebuild

122

@@ -140,7 +140,8 @@ pkg_setup() {

123

124

 src_prepare() {

125

 	default

126

-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf

127

+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \

128

+		AC_CONFIG_SUBDIRS=menuselect eautoreconf

129

}

130

131

 src_configure() {

132

@@ -148,6 +149,7 @@ src_configure() {

133

 	local copt cstate

134

135

 	econf \

136

+		SED=sed \

137

 		LUA_VERSION="${ELUA#lua}" \

138

 		--libdir="/usr/$(get_libdir)" \

139

 		--localstatedir="/var" \

140

141

diff --git a/net-misc/asterisk/asterisk-18.10.0-r1.ebuild b/net-misc/asterisk/asterisk-18.10.0-r1.ebuild

142

index e9039223c4c5..ef4b7a3b8d86 100644

143

--- a/net-misc/asterisk/asterisk-18.10.0-r1.ebuild

144

+++ b/net-misc/asterisk/asterisk-18.10.0-r1.ebuild

145

@@ -138,7 +138,8 @@ pkg_setup() {

146

147

 src_prepare() {

148

 	default

149

-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf

150

+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \

151

+		AC_CONFIG_SUBDIRS=menuselect eautoreconf

152

}

153

154

 src_configure() {

155

156

diff --git a/net-misc/asterisk/asterisk-18.13.0.ebuild b/net-misc/asterisk/asterisk-18.13.0.ebuild

157

index 1b1230192ff3..cdb30c050d92 100644

158

--- a/net-misc/asterisk/asterisk-18.13.0.ebuild

159

+++ b/net-misc/asterisk/asterisk-18.13.0.ebuild

160

@@ -138,7 +138,8 @@ pkg_setup() {

161

162

 src_prepare() {

163

 	default

164

-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf

165

+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \

166

+		AC_CONFIG_SUBDIRS=menuselect eautoreconf

167

}

168

169

 src_configure() {

170

171

diff --git a/net-misc/asterisk/asterisk-18.8.0-r1.ebuild b/net-misc/asterisk/asterisk-18.8.0-r1.ebuild

172

index bc3f597e95ac..1242bbbadaa3 100644

173

--- a/net-misc/asterisk/asterisk-18.8.0-r1.ebuild

174

+++ b/net-misc/asterisk/asterisk-18.8.0-r1.ebuild

175

@@ -138,7 +138,8 @@ pkg_setup() {

176

177

 src_prepare() {

178

 	default

179

-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf

180

+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \

181

+		AC_CONFIG_SUBDIRS=menuselect eautoreconf

182

}

183

184

 src_configure() {

185

186

diff --git a/net-misc/asterisk/asterisk-18.9.0-r1.ebuild b/net-misc/asterisk/asterisk-18.9.0-r1.ebuild

187

index e9039223c4c5..ef4b7a3b8d86 100644

188

--- a/net-misc/asterisk/asterisk-18.9.0-r1.ebuild

189

+++ b/net-misc/asterisk/asterisk-18.9.0-r1.ebuild

190

@@ -138,7 +138,8 @@ pkg_setup() {

191

192

 src_prepare() {

193

 	default

194

-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf

195

+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \

196

+		AC_CONFIG_SUBDIRS=menuselect eautoreconf

197

}

198

199

 src_configure() {

1	commit: a8798b7bd83135647851684f6bf1cd8e1322040c
2	Author: Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za>
3	AuthorDate: Thu Aug 18 20:46:10 2022 +0000
4	Commit: Sam James <sam <AT> gentoo <DOT> org>
5	CommitDate: Thu Aug 18 21:01:39 2022 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8798b7b
7
8	net-misc/asterisk: ./configure fixes.
9
10	1. there is a ./configure in menuselect, so eautoreconf should run
11	there too.
12	2. SED= is set in that menuselect/configure only after using, resulting
13	in "./configure: line 5027: -e: command not found", which ends up
14	that libxml-2.0 is detected, but the CFLAGS for the package isn't
15	correctly set, resulting in failure at a later stage to #include
16	<libxml/parser.h>
17
18	Package-Manager: Portage-3.0.30, Repoman-3.0.3
19	Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za>
20	Closes: https://github.com/gentoo/gentoo/pull/26916
21	Signed-off-by: Sam James <sam <AT> gentoo.org>
22
23	net-misc/asterisk/asterisk-13.38.3-r3.ebuild \| 3 ++-
24	net-misc/asterisk/asterisk-16.22.0-r1.ebuild \| 3 ++-
25	net-misc/asterisk/asterisk-16.23.0-r1.ebuild \| 3 ++-
26	net-misc/asterisk/asterisk-16.24.0-r1.ebuild \| 3 ++-
27	net-misc/asterisk/asterisk-16.26.1.ebuild \| 4 +++-
28	net-misc/asterisk/asterisk-16.27.0.ebuild \| 4 +++-
29	net-misc/asterisk/asterisk-18.10.0-r1.ebuild \| 3 ++-
30	net-misc/asterisk/asterisk-18.13.0.ebuild \| 3 ++-
31	net-misc/asterisk/asterisk-18.8.0-r1.ebuild \| 3 ++-
32	net-misc/asterisk/asterisk-18.9.0-r1.ebuild \| 3 ++-
33	10 files changed, 22 insertions(+), 10 deletions(-)
34
35	diff --git a/net-misc/asterisk/asterisk-13.38.3-r3.ebuild b/net-misc/asterisk/asterisk-13.38.3-r3.ebuild
36	index f751e394bb25..2bd6004948b9 100644
37	--- a/net-misc/asterisk/asterisk-13.38.3-r3.ebuild
38	+++ b/net-misc/asterisk/asterisk-13.38.3-r3.ebuild
39	@@ -139,7 +139,8 @@ pkg_setup() {
40
41	src_prepare() {
42	default
43	- AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
44	+ AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \
45	+ AC_CONFIG_SUBDIRS=menuselect eautoreconf
46	}
47
48	src_configure() {
49
50	diff --git a/net-misc/asterisk/asterisk-16.22.0-r1.ebuild b/net-misc/asterisk/asterisk-16.22.0-r1.ebuild
51	index d93cebbd447b..b4d9db65f36e 100644
52	--- a/net-misc/asterisk/asterisk-16.22.0-r1.ebuild
53	+++ b/net-misc/asterisk/asterisk-16.22.0-r1.ebuild
54	@@ -140,7 +140,8 @@ pkg_setup() {
55
56	src_prepare() {
57	default
58	- AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
59	+ AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \
60	+ AC_CONFIG_SUBDIRS=menuselect eautoreconf
61	}
62
63	src_configure() {
64
65	diff --git a/net-misc/asterisk/asterisk-16.23.0-r1.ebuild b/net-misc/asterisk/asterisk-16.23.0-r1.ebuild
66	index b1734d7ddad9..5651421ddd25 100644
67	--- a/net-misc/asterisk/asterisk-16.23.0-r1.ebuild
68	+++ b/net-misc/asterisk/asterisk-16.23.0-r1.ebuild
69	@@ -140,7 +140,8 @@ pkg_setup() {
70
71	src_prepare() {
72	default
73	- AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
74	+ AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \
75	+ AC_CONFIG_SUBDIRS=menuselect eautoreconf
76	}
77
78	src_configure() {
79
80	diff --git a/net-misc/asterisk/asterisk-16.24.0-r1.ebuild b/net-misc/asterisk/asterisk-16.24.0-r1.ebuild
81	index b1734d7ddad9..5651421ddd25 100644
82	--- a/net-misc/asterisk/asterisk-16.24.0-r1.ebuild
83	+++ b/net-misc/asterisk/asterisk-16.24.0-r1.ebuild
84	@@ -140,7 +140,8 @@ pkg_setup() {
85
86	src_prepare() {
87	default
88	- AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
89	+ AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \
90	+ AC_CONFIG_SUBDIRS=menuselect eautoreconf
91	}
92
93	src_configure() {
94
95	diff --git a/net-misc/asterisk/asterisk-16.26.1.ebuild b/net-misc/asterisk/asterisk-16.26.1.ebuild
96	index a2765b2dde1f..357286071693 100644
97	--- a/net-misc/asterisk/asterisk-16.26.1.ebuild
98	+++ b/net-misc/asterisk/asterisk-16.26.1.ebuild
99	@@ -140,7 +140,8 @@ pkg_setup() {
100
101	src_prepare() {
102	default
103	- AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
104	+ AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \
105	+ AC_CONFIG_SUBDIRS=menuselect eautoreconf
106	}
107
108	src_configure() {
109	@@ -148,6 +149,7 @@ src_configure() {
110	local copt cstate
111
112	econf \
113	+ SED=sed \
114	LUA_VERSION="${ELUA#lua}" \
115	--libdir="/usr/$(get_libdir)" \
116	--localstatedir="/var" \
117
118	diff --git a/net-misc/asterisk/asterisk-16.27.0.ebuild b/net-misc/asterisk/asterisk-16.27.0.ebuild
119	index a2765b2dde1f..357286071693 100644
120	--- a/net-misc/asterisk/asterisk-16.27.0.ebuild
121	+++ b/net-misc/asterisk/asterisk-16.27.0.ebuild
122	@@ -140,7 +140,8 @@ pkg_setup() {
123
124	src_prepare() {
125	default
126	- AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
127	+ AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \
128	+ AC_CONFIG_SUBDIRS=menuselect eautoreconf
129	}
130
131	src_configure() {
132	@@ -148,6 +149,7 @@ src_configure() {
133	local copt cstate
134
135	econf \
136	+ SED=sed \
137	LUA_VERSION="${ELUA#lua}" \
138	--libdir="/usr/$(get_libdir)" \
139	--localstatedir="/var" \
140
141	diff --git a/net-misc/asterisk/asterisk-18.10.0-r1.ebuild b/net-misc/asterisk/asterisk-18.10.0-r1.ebuild
142	index e9039223c4c5..ef4b7a3b8d86 100644
143	--- a/net-misc/asterisk/asterisk-18.10.0-r1.ebuild
144	+++ b/net-misc/asterisk/asterisk-18.10.0-r1.ebuild
145	@@ -138,7 +138,8 @@ pkg_setup() {
146
147	src_prepare() {
148	default
149	- AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
150	+ AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \
151	+ AC_CONFIG_SUBDIRS=menuselect eautoreconf
152	}
153
154	src_configure() {
155
156	diff --git a/net-misc/asterisk/asterisk-18.13.0.ebuild b/net-misc/asterisk/asterisk-18.13.0.ebuild
157	index 1b1230192ff3..cdb30c050d92 100644
158	--- a/net-misc/asterisk/asterisk-18.13.0.ebuild
159	+++ b/net-misc/asterisk/asterisk-18.13.0.ebuild
160	@@ -138,7 +138,8 @@ pkg_setup() {
161
162	src_prepare() {
163	default
164	- AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
165	+ AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \
166	+ AC_CONFIG_SUBDIRS=menuselect eautoreconf
167	}
168
169	src_configure() {
170
171	diff --git a/net-misc/asterisk/asterisk-18.8.0-r1.ebuild b/net-misc/asterisk/asterisk-18.8.0-r1.ebuild
172	index bc3f597e95ac..1242bbbadaa3 100644
173	--- a/net-misc/asterisk/asterisk-18.8.0-r1.ebuild
174	+++ b/net-misc/asterisk/asterisk-18.8.0-r1.ebuild
175	@@ -138,7 +138,8 @@ pkg_setup() {
176
177	src_prepare() {
178	default
179	- AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
180	+ AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \
181	+ AC_CONFIG_SUBDIRS=menuselect eautoreconf
182	}
183
184	src_configure() {
185
186	diff --git a/net-misc/asterisk/asterisk-18.9.0-r1.ebuild b/net-misc/asterisk/asterisk-18.9.0-r1.ebuild
187	index e9039223c4c5..ef4b7a3b8d86 100644
188	--- a/net-misc/asterisk/asterisk-18.9.0-r1.ebuild
189	+++ b/net-misc/asterisk/asterisk-18.9.0-r1.ebuild
190	@@ -138,7 +138,8 @@ pkg_setup() {
191
192	src_prepare() {
193	default
194	- AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
195	+ AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \
196	+ AC_CONFIG_SUBDIRS=menuselect eautoreconf
197	}
198
199	src_configure() {

Gentoo Archives: gentoo-commits