From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1437763-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 1CAE5158094
for <garchives@archives.gentoo.org>; Tue, 20 Sep 2022 00:43:11 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 4640CE07D4;
Tue, 20 Sep 2022 00:43:10 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 2CDEAE07D4
for <gentoo-commits@lists.gentoo.org>; Tue, 20 Sep 2022 00:43:10 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 0FB61341122
for <gentoo-commits@lists.gentoo.org>; Tue, 20 Sep 2022 00:43:09 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 4A0B05CB
for <gentoo-commits@lists.gentoo.org>; Tue, 20 Sep 2022 00:43:07 +0000 (UTC)
From: "Marek Szuba" <marecki@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" <marecki@gentoo.org>
Message-ID: <1663634578.c9eaacb7f947b4fc08bc6631223b9398760ef7c4.marecki@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-gfx/gmic/gmic-3.1.6.ebuild
X-VCS-Directories: media-gfx/gmic/
X-VCS-Committer: marecki
X-VCS-Committer-Name: Marek Szuba
X-VCS-Revision: c9eaacb7f947b4fc08bc6631223b9398760ef7c4
X-VCS-Branch: master
Date: Tue, 20 Sep 2022 00:43:07 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: e8432126-0a1e-4249-a331-0b8bf6222e5b
X-Archives-Hash: 3779fb925fa8aabadb70175fd6c2ef48
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[@]}" \
$@
}