[gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpx/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpx/
Date: Wed, 15 May 2019 14:53:55 +0000 (UTC)	[thread overview]
Message-ID: <1557932005.f4767091efcd8b721b039d7bb2973fc71269fb7f.asturm@gentoo> (raw)

commit:     f4767091efcd8b721b039d7bb2973fc71269fb7f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 15 14:29:41 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 15 14:53:25 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4767091

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 <AT> gentoo.org>

 sys-cluster/hpx/hpx-1.2.1.ebuild | 28 ++++++++++++++--------------
 1 file 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 e4605b1b99c..a57d12d298d 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

next             reply	other threads:[~2019-05-15 14:53 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-15 14:53 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-07-23  2:32 [gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpx/ Sam James
2025-07-23  2:32 Sam James
2024-07-13  8:11 Joonas Niilola
2024-07-13  8:11 Joonas Niilola
2023-09-16  7:57 Joonas Niilola
2023-09-16  7:57 Joonas Niilola
2023-09-16  7:57 Joonas Niilola
2023-05-20  6:28 Sam James
2023-05-20  6:28 Sam James
2022-06-03  8:35 Florian Schmaus
2021-10-29 22:23 Sam James
2021-08-26 22:21 Sam James
2021-08-26 22:21 Sam James
2021-07-23 14:33 Joonas Niilola
2021-07-23 14:33 Joonas Niilola
2021-07-23 14:33 Joonas Niilola
2021-07-17 18:18 David Seifert
2020-10-31  9:47 Joonas Niilola
2020-07-24 12:03 Joonas Niilola
2020-07-24 12:03 Joonas Niilola
2020-03-28 14:21 Joonas Niilola
2020-03-28 14:21 Joonas Niilola
2020-03-28 14:21 Joonas Niilola
2020-03-28 14:21 Joonas Niilola
2020-03-25 11:17 Joonas Niilola
2020-02-10 13:26 Michał Górny
2020-01-01 13:28 Andreas Sturmlechner
2019-05-15 14:53 Andreas Sturmlechner
2019-05-15 14:53 Andreas Sturmlechner
2019-05-15 14:53 Andreas Sturmlechner
2018-12-07 15:40 Christoph Junghans
2018-10-30 10:36 Christoph Junghans
2017-12-10 10:27 Pacho Ramos
2017-07-12 14:43 Pacho Ramos
2017-05-26 22:54 David Seifert
2017-05-12  8:07 Slawek Lis
2017-05-04  6:21 Slawek Lis
2016-07-22 20:12 Christoph Junghans
2016-07-22 20:12 Christoph Junghans

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:e4605b1b99 dfblob:a57d12d298 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpx/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1557932005.f4767091efcd8b721b039d7bb2973fc71269fb7f.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox