Gentoo Archives: gentoo-commits

From: Tim Harder <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/tinyxml2/
Date: Wed, 12 Dec 2018 23:53:51
Message-Id: 1544658780.82efb81ecff61c7a88628cdead9eb6ee8d32d85b.radhermit@gentoo
1 commit: 82efb81ecff61c7a88628cdead9eb6ee8d32d85b
2 Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 12 23:47:25 2018 +0000
4 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 12 23:53:00 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82efb81e
7
8 dev-libs/tinyxml2: drop static-libs USE flag
9
10 Upstream collapsed static/shared builds into one target and we don't
11 have any current users of static-libs in the tree so drop support for it
12 instead of figuring out how to run configure/build/install twice with
13 differing settings.
14
15 Closes: https://bugs.gentoo.org/673046
16
17 Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>
18
19 .../tinyxml2/{tinyxml2-7.0.1.ebuild => tinyxml2-7.0.1-r1.ebuild} | 7 ++-----
20 1 file changed, 2 insertions(+), 5 deletions(-)
21
22 diff --git a/dev-libs/tinyxml2/tinyxml2-7.0.1.ebuild b/dev-libs/tinyxml2/tinyxml2-7.0.1-r1.ebuild
23 similarity index 80%
24 rename from dev-libs/tinyxml2/tinyxml2-7.0.1.ebuild
25 rename to dev-libs/tinyxml2/tinyxml2-7.0.1-r1.ebuild
26 index f4420188b79..5e24e7bc18a 100644
27 --- a/dev-libs/tinyxml2/tinyxml2-7.0.1.ebuild
28 +++ b/dev-libs/tinyxml2/tinyxml2-7.0.1-r1.ebuild
29 @@ -12,12 +12,9 @@ SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
30 LICENSE="ZLIB"
31 SLOT="0/7"
32 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
33 -IUSE="static-libs test"
34 +IUSE="test"
35
36 multilib_src_configure() {
37 - local mycmakeargs=(
38 - -DBUILD_STATIC_LIBS=$(usex static-libs)
39 - -DBUILD_TESTING=$(usex test)
40 - )
41 + local mycmakeargs=( -DBUILD_TESTING=$(usex test) )
42 cmake-utils_src_configure
43 }