| 1 |
commit: b8faa24a8174cc49f97e25235d8b88c7e7266b6d |
| 2 |
Author: Chris Kerr <debdepba <AT> dasganma <DOT> tk> |
| 3 |
AuthorDate: Thu Jan 29 17:43:07 2015 +0000 |
| 4 |
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 29 17:59:13 2015 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b8faa24a |
| 7 |
|
| 8 |
Realised that BUILD_SHARED_LIBS doesn't do anything so removed the option |
| 9 |
|
| 10 |
In the main Mantid code, BUILD_SHARED_LIBS only has any effect under Cygwin. |
| 11 |
It also appears in the test code, specifically the bundled gmock and gtest, |
| 12 |
but there is a set(BUILD_SHARED_LIBS Off) command overriding what is set |
| 13 |
on the command line anyway. |
| 14 |
|
| 15 |
--- |
| 16 |
sci-visualization/mantid/mantid-3.3.0.ebuild | 3 +-- |
| 17 |
sci-visualization/mantid/metadata.xml | 1 - |
| 18 |
2 files changed, 1 insertion(+), 3 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sci-visualization/mantid/mantid-3.3.0.ebuild b/sci-visualization/mantid/mantid-3.3.0.ebuild |
| 21 |
index ecb38b2..a848c4c 100644 |
| 22 |
--- a/sci-visualization/mantid/mantid-3.3.0.ebuild |
| 23 |
+++ b/sci-visualization/mantid/mantid-3.3.0.ebuild |
| 24 |
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${MAJOR_PV}/${P}-Source.tar.gz" |
| 25 |
LICENSE="GPL-3+" |
| 26 |
SLOT="0" |
| 27 |
KEYWORDS="~amd64" |
| 28 |
-IUSE="doc +opencascade opencl paraview shared-libs tcmalloc test" |
| 29 |
+IUSE="doc +opencascade opencl paraview tcmalloc test" |
| 30 |
RESTRICT="test" # Testing requires sample data and X11 access |
| 31 |
|
| 32 |
# There is a list of dependencies on the Mantid website at: |
| 33 |
@@ -70,7 +70,6 @@ src_configure() { |
| 34 |
$(cmake-utils_use_use doc DOT) |
| 35 |
$(cmake-utils_use_no opencascade) |
| 36 |
$(cmake-utils_use opencl OPENCL_BUILD) |
| 37 |
- $(cmake-utils_use_build shared-libs SHARED_LIBS) |
| 38 |
$(cmake-utils_use_use tcmalloc TCMALLOC) |
| 39 |
$(cmake-utils_use paraview MAKE_VATES) |
| 40 |
$(cmake-utils_use_build test TESTING) |
| 41 |
|
| 42 |
diff --git a/sci-visualization/mantid/metadata.xml b/sci-visualization/mantid/metadata.xml |
| 43 |
index 44843e5..184c922 100644 |
| 44 |
--- a/sci-visualization/mantid/metadata.xml |
| 45 |
+++ b/sci-visualization/mantid/metadata.xml |
| 46 |
@@ -18,7 +18,6 @@ |
| 47 |
<flag name="opencascade">Use OpenCascade to show 3D models of instruments</flag> |
| 48 |
<flag name="opencl">Use OpenCL to accelerate calculations</flag> |
| 49 |
<flag name="paraview">Enable the Visualisation and Analysis Toolkit ExtensionS (VATES)</flag> |
| 50 |
- <flag name="shared-libs">Build shared libraries</flag> |
| 51 |
<flag name="tcmalloc">Use thread-caching malloc</flag> |
| 52 |
</use> |
| 53 |
</pkgmetadata> |
Archives