From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EF438158090 for ; Sat, 14 May 2022 21:30:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DBCC5E0952; Sat, 14 May 2022 21:30:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 87E2CE094A for ; Sat, 14 May 2022 21:30:40 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C2E33341B94 for ; Sat, 14 May 2022 21:30:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A82F2471 for ; Sat, 14 May 2022 21:30:36 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1652563810.ee0ebdf8b66069d30913d066a13ed712a305bada.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphicsmagick/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild media-gfx/graphicsmagick/graphicsmagick-9999.ebuild X-VCS-Directories: media-gfx/graphicsmagick/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: ee0ebdf8b66069d30913d066a13ed712a305bada X-VCS-Branch: master Date: Sat, 14 May 2022 21:30:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0740a141-838c-4d6f-af13-489bad023ce7 X-Archives-Hash: 09772e396c814cf9bd1a80ab6b0614c1 commit: ee0ebdf8b66069d30913d066a13ed712a305bada Author: David Seifert gentoo org> AuthorDate: Sat May 14 21:30:10 2022 +0000 Commit: David Seifert gentoo org> CommitDate: Sat May 14 21:30:10 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee0ebdf8 media-gfx/graphicsmagick: [QA] tc-has-openmp → tc-check-openmp Signed-off-by: David Seifert gentoo.org> media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild | 15 +++++++++------ media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild | 7 +------ media-gfx/graphicsmagick/graphicsmagick-9999.ebuild | 7 +------ 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild index 03a95689ff0e..85263d8a19fe 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild @@ -57,6 +57,14 @@ PATCHES=( "${FILESDIR}"/${PN}-1.3.19-perl.patch ) +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + src_prepare() { default @@ -68,19 +76,14 @@ src_configure() { use q16 && depth=16 use q32 && depth=32 - local openmp=disable - if use openmp && tc-has-openmp ; then - openmp=enable - fi - local myeconfargs=( - --${openmp}-openmp --enable-largefile --enable-shared $(use_enable static-libs static) $(use_enable debug prof) $(use_enable debug gcov) $(use_enable imagemagick magick-compat) + $(use_enable openmp) $(use_with threads) $(use_with dynamic-loading modules) --with-quantum-depth=${depth} diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild index c640b1b4cc74..bd91b4160147 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild @@ -91,6 +91,7 @@ src_configure() { $(use_enable debug prof) $(use_enable debug gcov) $(use_enable imagemagick magick-compat) + $(use_enable openmp) $(use_with threads) $(use_with dynamic-loading modules) --with-quantum-depth=${depth} @@ -121,12 +122,6 @@ src_configure() { $(use_with X x) ) - if use openmp && tc-has-openmp ; then - myeconfargs+=( --enable-openmp ) - else - myeconfargs+=( --disable-openmp ) - fi - econf "${myeconfargs[@]}" } diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild index c640b1b4cc74..bd91b4160147 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild @@ -91,6 +91,7 @@ src_configure() { $(use_enable debug prof) $(use_enable debug gcov) $(use_enable imagemagick magick-compat) + $(use_enable openmp) $(use_with threads) $(use_with dynamic-loading modules) --with-quantum-depth=${depth} @@ -121,12 +122,6 @@ src_configure() { $(use_with X x) ) - if use openmp && tc-has-openmp ; then - myeconfargs+=( --enable-openmp ) - else - myeconfargs+=( --disable-openmp ) - fi - econf "${myeconfargs[@]}" }