Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/
Date: Sun, 25 Dec 2016 22:00:09
Message-Id: 1482703189.dcef9e9c52c6d4b9b473838c669c54ad2b418b6f.grobian@gentoo
1 commit: dcef9e9c52c6d4b9b473838c669c54ad2b418b6f
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 25 21:59:29 2016 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 25 21:59:49 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcef9e9c
7
8 dev-util/cmake: fix linking on Solaris
9
10 Package-Manager: portage-2.2.28-prefix
11
12 dev-util/cmake/cmake-3.7.1.ebuild | 5 ++++-
13 1 file changed, 4 insertions(+), 1 deletion(-)
14
15 diff --git a/dev-util/cmake/cmake-3.7.1.ebuild b/dev-util/cmake/cmake-3.7.1.ebuild
16 index 7bda50d..422a96f 100644
17 --- a/dev-util/cmake/cmake-3.7.1.ebuild
18 +++ b/dev-util/cmake/cmake-3.7.1.ebuild
19 @@ -5,7 +5,7 @@
20 EAPI=6
21
22 CMAKE_REMOVE_MODULES="no"
23 -inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
24 +inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx flag-o-matic
25
26 MY_P="${P/_/-}"
27
28 @@ -135,6 +135,9 @@ src_prepare() {
29 }
30
31 src_configure() {
32 + # Fix linking on Solaris
33 + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
34 +
35 local mycmakeargs=(
36 -DCMAKE_USE_SYSTEM_LIBRARIES=ON
37 -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)