Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/
Date: Fri, 01 Jan 2016 09:38:01
Message-Id: 1451641048.d8d31e5ad00737872046269b339e327bc715f318.mgorny@gentoo
1 commit: d8d31e5ad00737872046269b339e327bc715f318
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 1 08:52:15 2016 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 1 09:37:28 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8d31e5a
7
8 dev-db/mongodb: Convert scons_opts into an array, to preserve whitespace
9
10 dev-db/mongodb/mongodb-3.2.0.ebuild | 32 ++++++++++++++++++--------------
11 1 file changed, 18 insertions(+), 14 deletions(-)
12
13 diff --git a/dev-db/mongodb/mongodb-3.2.0.ebuild b/dev-db/mongodb/mongodb-3.2.0.ebuild
14 index c8836f7..a317780 100644
15 --- a/dev-db/mongodb/mongodb-3.2.0.ebuild
16 +++ b/dev-db/mongodb/mongodb-3.2.0.ebuild
17 @@ -64,29 +64,33 @@ pkg_setup() {
18 # --use-system-tcmalloc is strongly NOT recommended:
19 # https://www.mongodb.org/about/contributors/tutorial/build-mongodb-from-source/
20
21 - scons_opts+=" --disable-warnings-as-errors"
22 - scons_opts+=" --use-system-boost"
23 - scons_opts+=" --use-system-pcre"
24 - scons_opts+=" --use-system-snappy"
25 - scons_opts+=" --use-system-stemmer"
26 - scons_opts+=" --use-system-yaml"
27 - scons_opts+=" --use-system-zlib"
28 + scons_opts=(
29 + --disable-warnings-as-errors
30 + --use-system-boost
31 + --use-system-pcre
32 + --use-system-snappy
33 + --use-system-stemmer
34 + --use-system-yaml
35 + --use-system-zlib
36 + )
37
38 if use debug; then
39 - scons_opts+=" --dbg=on"
40 + scons_opts+=( --dbg=on )
41 fi
42
43 if use prefix; then
44 - scons_opts+=" --cpppath=${EPREFIX}/usr/include"
45 - scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
46 + scons_opts+=(
47 + --cpppath="${EPREFIX}/usr/include"
48 + --libpath="${EPREFIX}/usr/$(get_libdir)"
49 + )
50 fi
51
52 if use kerberos; then
53 - scons_opts+=" --use-sasl-client"
54 + scons_opts+=( --use-sasl-client )
55 fi
56
57 if use ssl; then
58 - scons_opts+=" --ssl"
59 + scons_opts+=( --ssl )
60 fi
61 }
62
63 @@ -101,11 +105,11 @@ src_compile() {
64 filter-flags '-m*'
65 filter-flags '-O?'
66 fi
67 - escons ${scons_opts} core tools
68 + escons "${scons_opts[@]}" core tools
69 }
70
71 src_install() {
72 - escons ${scons_opts} --nostrip install --prefix="${ED}"/usr
73 + escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
74
75 for x in /var/{lib,log}/${PN}; do
76 keepdir "${x}"