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

Gentoo Archives: gentoo-commits

From: Christian Ruppert <idl0r@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/
Date: Wed, 28 Sep 2016 19:54:06
Message-Id: 1475092430.a37afa92e2fcdc3c768f162480edb70143a937a7.idl0r@gentoo
1 commit: a37afa92e2fcdc3c768f162480edb70143a937a7
2 Author: Bertrand Jacquin <bertrand <AT> jacquin <DOT> bzh>
3 AuthorDate: Sat Sep 17 23:38:51 2016 +0000
4 Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 28 19:53:50 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a37afa92
7
8 net-proxy/haproxy: Use an array to define emake arguments
9
10 It makes the code more clear and avoid duplication
11
12 Package-Manager: portage-2.2.28
13 Closes: https://github.com/gentoo/gentoo/pull/2293
14
15 Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org>
16
17 net-proxy/haproxy/haproxy-1.6.9.ebuild | 41 ++++++++++++++++++----------------
18 net-proxy/haproxy/haproxy-9999.ebuild | 41 ++++++++++++++++++----------------
19 2 files changed, 44 insertions(+), 38 deletions(-)
20
21 diff --git a/net-proxy/haproxy/haproxy-1.6.9.ebuild b/net-proxy/haproxy/haproxy-1.6.9.ebuild
22 index 8518135..3052698 100644
23 --- a/net-proxy/haproxy/haproxy-1.6.9.ebuild
24 +++ b/net-proxy/haproxy/haproxy-1.6.9.ebuild
25 @@ -55,66 +55,69 @@ src_prepare() {
26 }
27
28 src_compile() {
29 - local args="TARGET=linux2628 USE_GETADDRINFO=1"
30 + local -a args=(
31 + TARGET=linux2628
32 + USE_GETADDRINFO=1
33 + )
34
35 if use crypt ; then
36 - args="${args} USE_LIBCRYPT=1"
37 + args+=( USE_LIBCRYPT=1 )
38 else
39 - args="${args} USE_LIBCRYPT="
40 + args+=( USE_LIBCRYPT= )
41 fi
42
43 # bug 541042
44 # if use lua; then
45 -# args="${args} USE_LUA=1"
46 +# args+=( USE_LUA=1 )
47 # else
48 - args="${args} USE_LUA="
49 + args+=( USE_LUA= )
50 # fi
51
52 if use net_ns; then
53 - args="${args} USE_NS=1"
54 + args+=( USE_NS=1 )
55 else
56 - args="${args} USE_NS="
57 + args+=( USE_NS= )
58 fi
59
60 if use pcre ; then
61 - args="${args} USE_PCRE=1"
62 + args+=( USE_PCRE=1 )
63 else
64 - args="${args} USE_PCRE="
65 + args+=( USE_PCRE= )
66 fi
67
68 if use pcre-jit; then
69 - args="${args} USE_PCRE_JIT=1"
70 + args+=( USE_PCRE_JIT=1 )
71 else
72 - args="${args} USE_PCRE_JIT="
73 + args+=( USE_PCRE_JIT= )
74 fi
75
76 # if use kernel_linux; then
77 -# args="${args} USE_LINUX_SPLICE=1 USE_LINUX_TPROXY=1"
78 +# args+=( USE_LINUX_SPLICE=1 USE_LINUX_TPROXY=1 )
79 # else
80 -# args="${args} USE_LINUX_SPLICE= USE_LINUX_TPROXY="
81 +# args+=( USE_LINUX_SPLICE= USE_LINUX_TPROXY= )
82 # fi
83
84 if use ssl ; then
85 - args="${args} USE_OPENSSL=1"
86 + args+=( USE_OPENSSL=1 )
87 else
88 - args="${args} USE_OPENSSL="
89 + args+=( USE_OPENSSL= )
90 fi
91
92 if use zlib ; then
93 - args="${args} USE_ZLIB=1"
94 + args+=( USE_ZLIB=1 )
95 else
96 - args="${args} USE_ZLIB="
97 + args+=( USE_ZLIB= )
98 fi
99
100 # For now, until the strict-aliasing breakage will be fixed
101 append-cflags -fno-strict-aliasing
102
103 - emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
104 + emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
105
106 if use tools ; then
107 for contrib in halog iprange ; do
108 emake -C contrib/${contrib} \
109 - CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
110 + CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
111 done
112 fi
113 }
114
115 diff --git a/net-proxy/haproxy/haproxy-9999.ebuild b/net-proxy/haproxy/haproxy-9999.ebuild
116 index f2325eb..a140ddb 100644
117 --- a/net-proxy/haproxy/haproxy-9999.ebuild
118 +++ b/net-proxy/haproxy/haproxy-9999.ebuild
119 @@ -55,66 +55,69 @@ src_prepare() {
120 }
121
122 src_compile() {
123 - local args="TARGET=linux2628 USE_GETADDRINFO=1"
124 + local -a args=(
125 + TARGET=linux2628
126 + USE_GETADDRINFO=1
127 + )
128
129 if use crypt ; then
130 - args="${args} USE_LIBCRYPT=1"
131 + args+=( USE_LIBCRYPT=1 )
132 else
133 - args="${args} USE_LIBCRYPT="
134 + args+=( USE_LIBCRYPT= )
135 fi
136
137 # bug 541042
138 # if use lua; then
139 -# args="${args} USE_LUA=1"
140 +# args+=( USE_LUA=1 )
141 # else
142 - args="${args} USE_LUA="
143 + args+=( USE_LUA= )
144 # fi
145
146 if use net_ns; then
147 - args="${args} USE_NS=1"
148 + args+=( USE_NS=1 )
149 else
150 - args="${args} USE_NS="
151 + args+=( USE_NS= )
152 fi
153
154 if use pcre ; then
155 - args="${args} USE_PCRE=1"
156 + args+=( USE_PCRE=1 )
157 else
158 - args="${args} USE_PCRE="
159 + args+=( USE_PCRE= )
160 fi
161
162 if use pcre-jit; then
163 - args="${args} USE_PCRE_JIT=1"
164 + args+=( USE_PCRE_JIT=1 )
165 else
166 - args="${args} USE_PCRE_JIT="
167 + args+=( USE_PCRE_JIT= )
168 fi
169
170 # if use kernel_linux; then
171 -# args="${args} USE_LINUX_SPLICE=1 USE_LINUX_TPROXY=1"
172 +# args+=( USE_LINUX_SPLICE=1 USE_LINUX_TPROXY=1 )
173 # else
174 -# args="${args} USE_LINUX_SPLICE= USE_LINUX_TPROXY="
175 +# args+=( USE_LINUX_SPLICE= USE_LINUX_TPROXY= )
176 # fi
177
178 if use ssl ; then
179 - args="${args} USE_OPENSSL=1"
180 + args+=( USE_OPENSSL=1 )
181 else
182 - args="${args} USE_OPENSSL="
183 + args+=( USE_OPENSSL= )
184 fi
185
186 if use zlib ; then
187 - args="${args} USE_ZLIB=1"
188 + args+=( USE_ZLIB=1 )
189 else
190 - args="${args} USE_ZLIB="
191 + args+=( USE_ZLIB= )
192 fi
193
194 # For now, until the strict-aliasing breakage will be fixed
195 append-cflags -fno-strict-aliasing
196
197 - emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
198 + emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
199
200 if use tools ; then
201 for contrib in halog iprange ; do
202 emake -C contrib/${contrib} \
203 - CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
204 + CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
205 done
206 fi
207 }
Report Message
Find on MARC Find on Google Groups