public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Marek Szuba" <marecki@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
Date: Tue, 20 Sep 2022 00:43:07 +0000 (UTC)	[thread overview]
Message-ID: <1663634578.c9eaacb7f947b4fc08bc6631223b9398760ef7c4.marecki@gentoo> (raw)

commit:     c9eaacb7f947b4fc08bc6631223b9398760ef7c4
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 19 23:51:49 2022 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Sep 20 00:42:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9eaacb7

media-gfx/gmic: use different OpenMP library when using clang

Closes: https://bugs.gentoo.org/870823
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/gmic-3.1.6.ebuild | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/media-gfx/gmic/gmic-3.1.6.ebuild b/media-gfx/gmic/gmic-3.1.6.ebuild
index 936aba83276c..da836f3b546c 100644
--- a/media-gfx/gmic/gmic-3.1.6.ebuild
+++ b/media-gfx/gmic/gmic-3.1.6.ebuild
@@ -80,24 +80,30 @@ pkg_setup() {
 }
 
 gmic_emake() {
+	local mymakeargs=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		STRIP="/bin/true"
+		LIB="$(get_libdir)"
+		OPT_CFLAGS="${CXXFLAGS}"
+		OPT_LIBS="${LDFLAGS}"
+		GMIC_USE_CURL=$(usex curl)
+		GMIC_USE_EXR=$(usex openexr)
+		GMIC_USE_FFTW=$(usex fftw)
+		GMIC_USE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		GMIC_USE_JPEG=$(usex jpeg)
+		GMIC_USE_OPENCV=$(usex opencv)
+		GMIC_USE_OPENMP=$(usex openmp)
+		GMIC_USE_PNG=$(usex png)
+		GMIC_USE_TIFF=$(usex tiff)
+		GMIC_USE_X11=$(usex X)
+		QMAKE="qmake5"
+	)
+
+	tc-is-clang && mymakeargs+=( OPENMP_LIBS="-lomp" )
+
 	emake -j1 -C src \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		STRIP="/bin/true" \
-		LIB="$(get_libdir)" \
-		OPT_CFLAGS="${CXXFLAGS}" \
-		OPT_LIBS="${LDFLAGS}" \
-		GMIC_USE_CURL=$(usex curl) \
-		GMIC_USE_EXR=$(usex openexr) \
-		GMIC_USE_FFTW=$(usex fftw) \
-		GMIC_USE_GRAPHICSMAGICK=$(usex graphicsmagick) \
-		GMIC_USE_JPEG=$(usex jpeg) \
-		GMIC_USE_OPENCV=$(usex opencv) \
-		GMIC_USE_OPENMP=$(usex openmp) \
-		GMIC_USE_PNG=$(usex png) \
-		GMIC_USE_TIFF=$(usex tiff) \
-		GMIC_USE_X11=$(usex X) \
-		QMAKE="qmake5" \
+		"${mymakeargs[@]}" \
 		$@
 }
 


             reply	other threads:[~2022-09-20  0:43 UTC|newest]

Thread overview: 91+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-20  0:43 Marek Szuba [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-10-27 11:02 [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/ Marek Szuba
2023-10-26  0:38 Marek Szuba
2023-08-22 12:00 Sam James
2023-08-22 11:16 Sam James
2023-08-21 17:43 Sam James
2023-08-21 15:49 Marek Szuba
2023-07-10 23:04 Marek Szuba
2023-04-01 19:52 Sam James
2023-03-30  9:58 Sam James
2023-03-30  9:56 Sam James
2023-03-22 23:43 Marek Szuba
2023-03-01 23:12 Marek Szuba
2023-02-28 10:42 Marek Szuba
2022-12-16 20:57 Arthur Zamarin
2022-12-14  8:50 Sam James
2022-12-14  5:19 Sam James
2022-09-20  0:43 Marek Szuba
2022-09-01 23:22 Marek Szuba
2022-09-01 23:22 Marek Szuba
2022-09-01 23:22 Marek Szuba
2022-07-27 23:54 Marek Szuba
2022-07-27  8:43 Andreas Sturmlechner
2022-07-13 18:23 Marek Szuba
2022-05-14 21:30 David Seifert
2022-03-26 22:31 Marek Szuba
2022-03-01  0:02 Sam James
2022-02-28 23:58 Sam James
2022-02-28  5:21 Sam James
2022-01-14 15:35 Marek Szuba
2022-01-14 14:40 Arthur Zamarin
2022-01-13 11:58 Jakov Smolić
2022-01-13 11:57 Jakov Smolić
2022-01-02 12:58 Georgy Yakovlev
2021-12-29 13:46 Yixun Lan
2021-11-25 21:01 Marek Szuba
2021-11-25 20:07 Sam James
2021-11-20  7:26 Agostino Sarubbo
2021-11-19 18:10 Jakov Smolić
2021-09-09 10:45 Marek Szuba
2021-08-23 23:45 Marek Szuba
2021-08-23 22:16 Agostino Sarubbo
2021-08-23  0:39 Sam James
2021-08-21  4:49 Agostino Sarubbo
2021-07-16 13:59 Marek Szuba
2021-06-04 11:51 Marek Szuba
2021-06-04  8:14 Sam James
2021-05-26  6:49 Agostino Sarubbo
2021-05-25 15:04 Agostino Sarubbo
2021-04-27 11:05 Marek Szuba
2021-04-16 18:25 Marek Szuba
2021-04-16 18:25 Marek Szuba
2021-03-19 12:32 Marek Szuba
2021-03-14 22:03 Sam James
2021-03-12 15:28 Sam James
2021-03-12 15:25 Sam James
2021-02-15 12:26 Marek Szuba
2021-02-15  6:05 Sam James
2021-02-09  9:25 Marek Szuba
2021-02-08 13:48 Marek Szuba
2021-02-04  8:12 Agostino Sarubbo
2021-02-03  3:12 Sam James
2020-11-27 19:17 Marek Szuba
2020-11-18 15:14 Marek Szuba
2020-11-08 12:02 Sam James
2020-11-06 22:34 Sam James
2020-11-06 20:25 Marek Szuba
2020-11-06 17:18 Marek Szuba
2020-11-06 17:18 Marek Szuba
2020-10-31 11:11 David Seifert
2020-06-30  2:49 Tim Harder
2020-06-30  2:49 Tim Harder
2020-04-05 10:05 Tim Harder
2020-01-31  8:50 Tim Harder
2020-01-14 14:11 Tim Harder
2020-01-14 14:11 Tim Harder
2020-01-04  9:56 Andreas Sturmlechner
2020-01-03  6:34 Tim Harder
2020-01-02 22:36 Andreas Sturmlechner
2019-09-27  3:35 Tim Harder
2019-09-03  5:21 Tim Harder
2019-09-03  5:21 Tim Harder
2019-08-24  4:52 Tim Harder
2019-08-24  4:49 Tim Harder
2019-07-02 21:06 Tim Harder
2019-03-21 21:04 Tim Harder
2019-01-14  7:48 Tim Harder
2017-06-07  9:08 Tim Harder
2016-10-29 20:30 Tim Harder
2016-10-29  5:10 Tim Harder
2016-10-29  4:49 Tim Harder

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=1663634578.c9eaacb7f947b4fc08bc6631223b9398760ef7c4.marecki@gentoo \
    --to=marecki@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