public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/luminance-hdr/
Date: Sat, 14 May 2022 21:30:36 +0000 (UTC)	[thread overview]
Message-ID: <1652563813.cc1873206d3ed3507221a9fdba01f6702c447ee7.soap@gentoo> (raw)

commit:     cc1873206d3ed3507221a9fdba01f6702c447ee7
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 21:30:13 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat May 14 21:30:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc187320

media-gfx/luminance-hdr: [QA] tc-has-openmp → tc-check-openmp

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 media-gfx/luminance-hdr/luminance-hdr-2.6.0-r1.ebuild | 16 +++++++++-------
 media-gfx/luminance-hdr/luminance-hdr-2.6.1.1.ebuild  | 14 ++++++++------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.6.0-r1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.6.0-r1.ebuild
index 0a3b97a457c2..fe779b1d1abb 100644
--- a/media-gfx/luminance-hdr/luminance-hdr-2.6.0-r1.ebuild
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -56,6 +56,14 @@ PATCHES=(
 )
 
 pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
 	if use cpu_flags_x86_sse2 ; then
 		append-flags -msse2
 	else
@@ -63,12 +71,6 @@ pkg_pretend() {
 		die "SSE2 support missing"
 	fi
 
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package fits CFITSIO)
 		-DUSE_OPENMP="$(usex openmp)"

diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1.ebuild
index 063d91bee932..03ff1211b910 100644
--- a/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1.ebuild
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1.ebuild
@@ -57,6 +57,14 @@ PATCHES=(
 )
 
 pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
 	if use cpu_flags_x86_sse2 ; then
 		append-flags -msse2
 	else
@@ -64,14 +72,8 @@ pkg_pretend() {
 		die "SSE2 support missing"
 	fi
 
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
 	append-flags -std=c++17
-}
 
-src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package fits CFITSIO)
 		-DUSE_OPENMP="$(usex openmp)"


             reply	other threads:[~2022-05-14 21:30 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-14 21:30 David Seifert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-01-27 23:25 [gentoo-commits] repo/gentoo:master commit in: media-gfx/luminance-hdr/ Sam James
2025-01-21 22:16 Andreas Sturmlechner
2024-11-23 11:36 Andreas Sturmlechner
2023-02-07 10:37 Andreas Sturmlechner
2022-11-16  3:56 John Helmert III
2022-11-16  3:56 John Helmert III
2022-09-04 12:23 David Seifert
2022-02-28 23:58 Sam James
2022-02-28  5:21 Sam James
2021-10-16 23:15 Andreas K. Hüttel
2020-10-17 21:09 Andreas K. Hüttel
2020-10-16 17:29 Andreas K. Hüttel
2020-06-06 23:18 Andreas K. Hüttel
2019-10-21 12:47 Thomas Deutschmann
2019-10-11 10:09 Agostino Sarubbo
2018-06-16  7:04 Andreas Sturmlechner
2018-06-07 10:13 Agostino Sarubbo
2018-06-03 14:32 Andreas Sturmlechner
2018-01-08 17:31 Ulrich Müller
2018-01-08 17:31 Ulrich Müller
2017-01-02 19:41 Markus Meier
2016-12-31 22:20 Agostino Sarubbo
2016-02-18 18:07 Markus Meier
2015-10-01 14:21 Michael Palimaka

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=1652563813.cc1873206d3ed3507221a9fdba01f6702c447ee7.soap@gentoo \
    --to=soap@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