diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2019-05-15 16:29:41 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-05-15 16:53:25 +0200 |
| commit | f4767091efcd8b721b039d7bb2973fc71269fb7f (patch) | |
| tree | 0abc2686027f679b610e0ecb7264e26ca10be2c4 /sys-cluster | |
| parent | sys-cluster/hpx: EAPI-7 bump, simpler REQUIRED_USE, use https (diff) | |
| download | gentoo-f4767091efcd8b721b039d7bb2973fc71269fb7f.tar.gz gentoo-f4767091efcd8b721b039d7bb2973fc71269fb7f.tar.bz2 gentoo-f4767091efcd8b721b039d7bb2973fc71269fb7f.zip | |
sys-cluster/hpx: Fix (all) cmake options, drop unused
Closes: https://bugs.gentoo.org/678778
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'sys-cluster')
| -rw-r--r-- | sys-cluster/hpx/hpx-1.2.1.ebuild | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sys-cluster/hpx/hpx-1.2.1.ebuild b/sys-cluster/hpx/hpx-1.2.1.ebuild index e4605b1b99ce..a57d12d298d1 100644 --- a/sys-cluster/hpx/hpx-1.2.1.ebuild +++ b/sys-cluster/hpx/hpx-1.2.1.ebuild @@ -46,22 +46,22 @@ pkg_setup() { } src_configure() { - CMAKE_BUILD_TYPE=Release local mycmakeargs=( - -DHPX_BUILD_EXAMPLES=OFF - -DHPX_MALLOC=system - -DLIB=$(get_libdir) - -Dcmake_dir=cmake - -DHPX_BUILD_DOCUMENTATION=$(usex doc) - -DHPX_JEMALLOC=$(usex jemalloc) + -DHPX_WITH_EXAMPLES=OFF + -DHPX_WITH_DOCUMENTATION=$(usex doc) + -DHPX_WITH_PAPI=$(usex papi) + -DHPX_WITH_GOOGLE_PERFTOOLS=$(usex perftools) -DBUILD_TESTING=$(usex test) - -DHPX_GOOGLE_PERFTOOLS=$(usex perftools) - -DHPX_PAPI=$(usex papi) ) - - use jemalloc && mycmakeargs+=( -DHPX_MALLOC=jemalloc ) - use perftools && mycmakeargs+=( -DHPX_MALLOC=tcmalloc ) - use tbb && mycmakeargs+=( -DHPX_MALLOC=tbbmalloc ) + if use jemalloc; then + mycmakeargs+=( -DHPX_WITH_MALLOC=jemalloc ) + elif use perftools; then + mycmakeargs+=( -DHPX_WITH_MALLOC=tcmalloc ) + elif use tbb; then + mycmakeargs+=( -DHPX_WITH_MALLOC=tbbmalloc ) + else + mycmakeargs+=( -DHPX_WITH_MALLOC=system ) + fi cmake-utils_src_configure } @@ -73,8 +73,8 @@ src_test() { src_install() { cmake-utils_src_install - mv "${D}/usr/bin/spin" "${D}/usr/bin/hpx_spin" || die if use examples; then + mv "${D}/usr/bin/spin" "${D}/usr/bin/hpx_spin" || die insinto /usr/share/doc/${PF} doins -r examples fi |