From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 654D6139086 for ; Sun, 25 Dec 2016 22:00:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 647F021C012; Sun, 25 Dec 2016 22:00:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3F26E21C012 for ; Sun, 25 Dec 2016 22:00:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 166F23411D7 for ; Sun, 25 Dec 2016 22:00:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4AFEB24B0 for ; Sun, 25 Dec 2016 22:00:01 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1482703189.dcef9e9c52c6d4b9b473838c669c54ad2b418b6f.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/cmake/cmake-3.7.1.ebuild X-VCS-Directories: dev-util/cmake/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: dcef9e9c52c6d4b9b473838c669c54ad2b418b6f X-VCS-Branch: master Date: Sun, 25 Dec 2016 22:00:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0d98e31b-1927-4037-8c4b-4e32b4ac3468 X-Archives-Hash: 005a056867cf5e0455b6a3c3707444ed commit: dcef9e9c52c6d4b9b473838c669c54ad2b418b6f Author: Fabian Groffen gentoo org> AuthorDate: Sun Dec 25 21:59:29 2016 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun Dec 25 21:59:49 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcef9e9c dev-util/cmake: fix linking on Solaris Package-Manager: portage-2.2.28-prefix dev-util/cmake/cmake-3.7.1.ebuild | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dev-util/cmake/cmake-3.7.1.ebuild b/dev-util/cmake/cmake-3.7.1.ebuild index 7bda50d..422a96f 100644 --- a/dev-util/cmake/cmake-3.7.1.ebuild +++ b/dev-util/cmake/cmake-3.7.1.ebuild @@ -5,7 +5,7 @@ EAPI=6 CMAKE_REMOVE_MODULES="no" -inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx +inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx flag-o-matic MY_P="${P/_/-}" @@ -135,6 +135,9 @@ src_prepare() { } src_configure() { + # Fix linking on Solaris + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl + local mycmakeargs=( -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)