From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4C3C3138A1A for ; Sat, 31 Jan 2015 20:19:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DC5FCE0914; Sat, 31 Jan 2015 20:19:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 701DAE0914 for ; Sat, 31 Jan 2015 20:19:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E54543407E4 for ; Sat, 31 Jan 2015 20:19:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EC0EDE4C5 for ; Sat, 31 Jan 2015 20:19:15 +0000 (UTC) From: "Christoph Junghans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Junghans" Message-ID: <1422554353.b8faa24a8174cc49f97e25235d8b88c7e7266b6d.ottxor@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-visualization/mantid/ X-VCS-Repository: proj/sci X-VCS-Files: sci-visualization/mantid/mantid-3.3.0.ebuild sci-visualization/mantid/metadata.xml X-VCS-Directories: sci-visualization/mantid/ X-VCS-Committer: ottxor X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: b8faa24a8174cc49f97e25235d8b88c7e7266b6d X-VCS-Branch: master Date: Sat, 31 Jan 2015 20:19:15 +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: b5e47b9c-99c5-461b-a0b4-f70ab6913f7d X-Archives-Hash: 7aef269ddd30701f46ae020e9c0b7b15 commit: b8faa24a8174cc49f97e25235d8b88c7e7266b6d Author: Chris Kerr dasganma tk> AuthorDate: Thu Jan 29 17:43:07 2015 +0000 Commit: Christoph Junghans gentoo org> CommitDate: Thu Jan 29 17:59:13 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b8faa24a Realised that BUILD_SHARED_LIBS doesn't do anything so removed the option In the main Mantid code, BUILD_SHARED_LIBS only has any effect under Cygwin. It also appears in the test code, specifically the bundled gmock and gtest, but there is a set(BUILD_SHARED_LIBS Off) command overriding what is set on the command line anyway. --- sci-visualization/mantid/mantid-3.3.0.ebuild | 3 +-- sci-visualization/mantid/metadata.xml | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/sci-visualization/mantid/mantid-3.3.0.ebuild b/sci-visualization/mantid/mantid-3.3.0.ebuild index ecb38b2..a848c4c 100644 --- a/sci-visualization/mantid/mantid-3.3.0.ebuild +++ b/sci-visualization/mantid/mantid-3.3.0.ebuild @@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${MAJOR_PV}/${P}-Source.tar.gz" LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64" -IUSE="doc +opencascade opencl paraview shared-libs tcmalloc test" +IUSE="doc +opencascade opencl paraview tcmalloc test" RESTRICT="test" # Testing requires sample data and X11 access # There is a list of dependencies on the Mantid website at: @@ -70,7 +70,6 @@ src_configure() { $(cmake-utils_use_use doc DOT) $(cmake-utils_use_no opencascade) $(cmake-utils_use opencl OPENCL_BUILD) - $(cmake-utils_use_build shared-libs SHARED_LIBS) $(cmake-utils_use_use tcmalloc TCMALLOC) $(cmake-utils_use paraview MAKE_VATES) $(cmake-utils_use_build test TESTING) diff --git a/sci-visualization/mantid/metadata.xml b/sci-visualization/mantid/metadata.xml index 44843e5..184c922 100644 --- a/sci-visualization/mantid/metadata.xml +++ b/sci-visualization/mantid/metadata.xml @@ -18,7 +18,6 @@ Use OpenCascade to show 3D models of instruments Use OpenCL to accelerate calculations Enable the Visualisation and Analysis Toolkit ExtensionS (VATES) - Build shared libraries Use thread-caching malloc