commit: af8568f86305605d1171a655e534170160c74034
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 21:30:11 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat May 14 21:30:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af8568f8
media-gfx/imagemagick: [QA] tc-has-openmp → tc-check-openmp
Signed-off-by: David Seifert <soap <AT> gentoo.org>
media-gfx/imagemagick/imagemagick-6.9.12.28.ebuild | 15 ++++++++++-----
media-gfx/imagemagick/imagemagick-6.9.12.35-r1.ebuild | 13 +++++++++----
media-gfx/imagemagick/imagemagick-7.1.0.13.ebuild | 15 ++++++++++-----
media-gfx/imagemagick/imagemagick-7.1.0.20-r1.ebuild | 13 +++++++++----
media-gfx/imagemagick/imagemagick-9999.ebuild | 13 +++++++++----
5 files changed, 47 insertions(+), 22 deletions(-)
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.28.ebuild
b/media-gfx/imagemagick/imagemagick-6.9.12.28.ebuild
index 8c0ec1fe1979..170a23afd362 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.12.28.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.28.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="8"
@@ -80,6 +80,14 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${MY_P}"
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
src_prepare() {
default
@@ -123,9 +131,6 @@ src_configure() {
use q8 && depth=8
use q32 && depth=32
- local openmp=disable
- use openmp && { tc-has-openmp && openmp=enable; }
-
use perl && perl_check_env
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
@@ -134,6 +139,7 @@ src_configure() {
$(use_enable static-libs static)
$(use_enable hdri)
$(use_enable opencl)
+ $(use_enable openmp)
--with-threads
--with-modules
--with-quantum-depth=${depth}
@@ -171,7 +177,6 @@ src_configure() {
$(use_with corefonts windows-font-dir
"${EPREFIX}"/usr/share/fonts/corefonts)
$(use_with wmf)
$(use_with xml)
- --${openmp}-openmp
--with-gcc-arch=no-automagic
)
CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.35-r1.ebuild
b/media-gfx/imagemagick/imagemagick-6.9.12.35-r1.ebuild
index 5dfd56472f4f..e8658be55dc7 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.12.35-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.35-r1.ebuild
@@ -84,6 +84,14 @@ PATCHES=(
S="${WORKDIR}/${MY_P}"
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
src_prepare() {
default
eautoreconf
@@ -128,9 +136,6 @@ src_configure() {
use q8 && depth=8
use q32 && depth=32
- local openmp=disable
- use openmp && { tc-has-openmp && openmp=enable; }
-
use perl && perl_check_env
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
@@ -139,6 +144,7 @@ src_configure() {
$(use_enable static-libs static)
$(use_enable hdri)
$(use_enable opencl)
+ $(use_enable openmp)
--with-threads
--with-modules
--with-quantum-depth=${depth}
@@ -176,7 +182,6 @@ src_configure() {
$(use_with corefonts windows-font-dir
"${EPREFIX}"/usr/share/fonts/corefonts)
$(use_with wmf)
$(use_with xml)
- --${openmp}-openmp
)
CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
}
diff --git a/media-gfx/imagemagick/imagemagick-7.1.0.13.ebuild
b/media-gfx/imagemagick/imagemagick-7.1.0.13.ebuild
index 18d26de38e7a..ac18f6d0a928 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.0.13.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.0.13.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="8"
@@ -81,6 +81,14 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${MY_P}"
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
src_prepare() {
default
@@ -124,9 +132,6 @@ src_configure() {
use q8 && depth=8
use q32 && depth=32
- local openmp=disable
- use openmp && { tc-has-openmp && openmp=enable; }
-
use perl && perl_check_env
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
@@ -135,6 +140,7 @@ src_configure() {
$(use_enable static-libs static)
$(use_enable hdri)
$(use_enable opencl)
+ $(use_enable openmp)
--with-threads
--with-modules
--with-quantum-depth=${depth}
@@ -174,7 +180,6 @@ src_configure() {
$(use_with corefonts windows-font-dir
"${EPREFIX}"/usr/share/fonts/corefonts)
$(use_with wmf)
$(use_with xml)
- --${openmp}-openmp
--with-gcc-arch=no-automagic
)
CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
diff --git a/media-gfx/imagemagick/imagemagick-7.1.0.20-r1.ebuild
b/media-gfx/imagemagick/imagemagick-7.1.0.20-r1.ebuild
index 6bafcf4338af..f860410a5f2d 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.0.20-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.0.20-r1.ebuild
@@ -85,6 +85,14 @@ PATCHES=(
S="${WORKDIR}/${MY_P}"
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
src_prepare() {
default
eautoreconf
@@ -129,9 +137,6 @@ src_configure() {
use q8 && depth=8
use q32 && depth=32
- local openmp=disable
- use openmp && { tc-has-openmp && openmp=enable; }
-
use perl && perl_check_env
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
@@ -140,6 +145,7 @@ src_configure() {
$(use_enable static-libs static)
$(use_enable hdri)
$(use_enable opencl)
+ $(use_enable openmp)
--with-threads
--with-modules
--with-quantum-depth=${depth}
@@ -179,7 +185,6 @@ src_configure() {
$(use_with corefonts windows-font-dir
"${EPREFIX}"/usr/share/fonts/corefonts)
$(use_with wmf)
$(use_with xml)
- --${openmp}-openmp
)
CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
}
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild
b/media-gfx/imagemagick/imagemagick-9999.ebuild
index ce2194dd3355..0b6122942f86 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -85,6 +85,14 @@ PATCHES=(
S="${WORKDIR}/${MY_P}"
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
src_prepare() {
default
eautoreconf
@@ -129,9 +137,6 @@ src_configure() {
use q8 && depth=8
use q32 && depth=32
- local openmp=disable
- use openmp && { tc-has-openmp && openmp=enable; }
-
use perl && perl_check_env
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
@@ -140,6 +145,7 @@ src_configure() {
$(use_enable static-libs static)
$(use_enable hdri)
$(use_enable opencl)
+ $(use_enable openmp)
--with-threads
--with-modules
--with-quantum-depth=${depth}
@@ -179,7 +185,6 @@ src_configure() {
$(use_with corefonts windows-font-dir
"${EPREFIX}"/usr/share/fonts/corefonts)
$(use_with wmf)
$(use_with xml)
- --${openmp}-openmp
)
CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
}
