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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 49C2A138334 for ; Mon, 17 Jun 2019 15:42:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 49681E0898; Mon, 17 Jun 2019 15:42:45 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2D530E0898 for ; Mon, 17 Jun 2019 15:42:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 49DF6346320 for ; Mon, 17 Jun 2019 15:42:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A91A6326 for ; Mon, 17 Jun 2019 15:42:40 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1560786124.43dafe5bc3206ad6336d7d68c18eb79ecf5a0710.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/pixman/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/pixman/pixman-0.38.4.ebuild x11-libs/pixman/pixman-9999.ebuild X-VCS-Directories: x11-libs/pixman/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 43dafe5bc3206ad6336d7d68c18eb79ecf5a0710 X-VCS-Branch: master Date: Mon, 17 Jun 2019 15:42:40 +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: 1877c88d-291b-49e3-a667-25ebc15bcae0 X-Archives-Hash: 021b75366903b59ef9287ca85c7025d4 commit: 43dafe5bc3206ad6336d7d68c18eb79ecf5a0710 Author: Matt Turner gentoo org> AuthorDate: Mon Jun 17 15:40:52 2019 +0000 Commit: Matt Turner gentoo org> CommitDate: Mon Jun 17 15:42:04 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43dafe5b x11-libs/pixman: Use tc-has-openmp Closes: https://bugs.gentoo.org/684656 Signed-off-by: Matt Turner gentoo.org> x11-libs/pixman/pixman-0.38.4.ebuild | 7 +++++-- x11-libs/pixman/pixman-9999.ebuild | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/x11-libs/pixman/pixman-0.38.4.ebuild b/x11-libs/pixman/pixman-0.38.4.ebuild index 3fbd5e9c832..b5fcceac957 100644 --- a/x11-libs/pixman/pixman-0.38.4.ebuild +++ b/x11-libs/pixman/pixman-0.38.4.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then GIT_ECLASS="git-r3" fi -inherit ${GIT_ECLASS} meson multilib-minimal +inherit ${GIT_ECLASS} meson multilib-minimal toolchain-funcs DESCRIPTION="Low-level pixel manipulation routines" HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/" @@ -30,6 +30,9 @@ src_unpack() { } multilib_src_configure() { + local openmp=disabled + tc-has-openmp && openmp=enabled + local emesonargs=( $(meson_feature cpu_flags_arm_iwmmxt iwmmxt) $(meson_use cpu_flags_arm_iwmmxt2 iwmmxt2) @@ -41,7 +44,7 @@ multilib_src_configure() { $(meson_feature loongson2f loongson-mmi) -Dgtk=disabled -Dlibpng=disabled - -Dopenmp=auto # only used in unit tests + -Dopenmp=$openmp # only used in unit tests ) meson_src_configure } diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild index 58862e4166b..0e6923456a8 100644 --- a/x11-libs/pixman/pixman-9999.ebuild +++ b/x11-libs/pixman/pixman-9999.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then GIT_ECLASS="git-r3" fi -inherit ${GIT_ECLASS} meson multilib-minimal +inherit ${GIT_ECLASS} meson multilib-minimal toolchain-funcs DESCRIPTION="Low-level pixel manipulation routines" HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/" @@ -30,6 +30,9 @@ src_unpack() { } multilib_src_configure() { + local openmp=disabled + tc-has-openmp && openmp=enabled + local emesonargs=( $(meson_feature cpu_flags_arm_iwmmxt iwmmxt) $(meson_use cpu_flags_arm_iwmmxt2 iwmmxt2) @@ -41,7 +44,7 @@ multilib_src_configure() { $(meson_feature loongson2f loongson-mmi) -Dgtk=disabled -Dlibpng=disabled - -Dopenmp=auto # only used in unit tests + -Dopenmp=$openmp # only used in unit tests ) meson_src_configure }