Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphicsmagick/
Date: Sat, 14 May 2022 21:30:42
Message-Id: 1652563810.ee0ebdf8b66069d30913d066a13ed712a305bada.soap@gentoo
1 commit: ee0ebdf8b66069d30913d066a13ed712a305bada
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 14 21:30:10 2022 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat May 14 21:30:10 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee0ebdf8
7
8 media-gfx/graphicsmagick: [QA] tc-has-openmp → tc-check-openmp
9
10 Signed-off-by: David Seifert <soap <AT> gentoo.org>
11
12 media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild | 15 +++++++++------
13 media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild | 7 +------
14 media-gfx/graphicsmagick/graphicsmagick-9999.ebuild | 7 +------
15 3 files changed, 11 insertions(+), 18 deletions(-)
16
17 diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild
18 index 03a95689ff0e..85263d8a19fe 100644
19 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild
20 +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild
21 @@ -57,6 +57,14 @@ PATCHES=(
22 "${FILESDIR}"/${PN}-1.3.19-perl.patch
23 )
24
25 +pkg_pretend() {
26 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
27 +}
28 +
29 +pkg_setup() {
30 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
31 +}
32 +
33 src_prepare() {
34 default
35
36 @@ -68,19 +76,14 @@ src_configure() {
37 use q16 && depth=16
38 use q32 && depth=32
39
40 - local openmp=disable
41 - if use openmp && tc-has-openmp ; then
42 - openmp=enable
43 - fi
44 -
45 local myeconfargs=(
46 - --${openmp}-openmp
47 --enable-largefile
48 --enable-shared
49 $(use_enable static-libs static)
50 $(use_enable debug prof)
51 $(use_enable debug gcov)
52 $(use_enable imagemagick magick-compat)
53 + $(use_enable openmp)
54 $(use_with threads)
55 $(use_with dynamic-loading modules)
56 --with-quantum-depth=${depth}
57
58 diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild
59 index c640b1b4cc74..bd91b4160147 100644
60 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild
61 +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild
62 @@ -91,6 +91,7 @@ src_configure() {
63 $(use_enable debug prof)
64 $(use_enable debug gcov)
65 $(use_enable imagemagick magick-compat)
66 + $(use_enable openmp)
67 $(use_with threads)
68 $(use_with dynamic-loading modules)
69 --with-quantum-depth=${depth}
70 @@ -121,12 +122,6 @@ src_configure() {
71 $(use_with X x)
72 )
73
74 - if use openmp && tc-has-openmp ; then
75 - myeconfargs+=( --enable-openmp )
76 - else
77 - myeconfargs+=( --disable-openmp )
78 - fi
79 -
80 econf "${myeconfargs[@]}"
81 }
82
83
84 diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
85 index c640b1b4cc74..bd91b4160147 100644
86 --- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
87 +++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
88 @@ -91,6 +91,7 @@ src_configure() {
89 $(use_enable debug prof)
90 $(use_enable debug gcov)
91 $(use_enable imagemagick magick-compat)
92 + $(use_enable openmp)
93 $(use_with threads)
94 $(use_with dynamic-loading modules)
95 --with-quantum-depth=${depth}
96 @@ -121,12 +122,6 @@ src_configure() {
97 $(use_with X x)
98 )
99
100 - if use openmp && tc-has-openmp ; then
101 - myeconfargs+=( --enable-openmp )
102 - else
103 - myeconfargs+=( --disable-openmp )
104 - fi
105 -
106 econf "${myeconfargs[@]}"
107 }