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 5A74E13835A for ; Sun, 6 Sep 2020 18:36:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A36EE08E8; Sun, 6 Sep 2020 18:36:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 5183FE08E8 for ; Sun, 6 Sep 2020 18:36:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 1940E33BE93 for ; Sun, 6 Sep 2020 18:36:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6D09B342 for ; Sun, 6 Sep 2020 18:36:37 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1599417384.0a0118d6d8576e7a0182af1d517b16a85a7f49b1.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/files/, media-gfx/mypaint/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/mypaint/files/mypaint-2.0.1-build-system.patch media-gfx/mypaint/mypaint-2.0.1.ebuild X-VCS-Directories: media-gfx/mypaint/files/ media-gfx/mypaint/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0a0118d6d8576e7a0182af1d517b16a85a7f49b1 X-VCS-Branch: master Date: Sun, 6 Sep 2020 18:36:37 +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: fcb872f9-65bd-402e-a034-8c9c9a953701 X-Archives-Hash: 505528d82dd8e83203d4c19b3c89eefb commit: 0a0118d6d8576e7a0182af1d517b16a85a7f49b1 Author: Sam James gentoo org> AuthorDate: Sun Sep 6 18:32:52 2020 +0000 Commit: Sam James gentoo org> CommitDate: Sun Sep 6 18:36:24 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a0118d6 media-gfx/mypaint: patch out openmp flag We'll return to whether we want USE=openmp later on, but there's no point for now, as it's being added unconditionally and libmypaint's openmp is causing a crash right now. Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Sam James gentoo.org> media-gfx/mypaint/files/mypaint-2.0.1-build-system.patch | 15 +++++++++++++++ media-gfx/mypaint/mypaint-2.0.1.ebuild | 5 +++++ 2 files changed, 20 insertions(+) diff --git a/media-gfx/mypaint/files/mypaint-2.0.1-build-system.patch b/media-gfx/mypaint/files/mypaint-2.0.1-build-system.patch index 63a7a5bf75e..c7806e7119d 100644 --- a/media-gfx/mypaint/files/mypaint-2.0.1-build-system.patch +++ b/media-gfx/mypaint/files/mypaint-2.0.1-build-system.patch @@ -20,3 +20,18 @@ index 670df4d..703f9d2 100644 ] extra_link_args = [] +diff --git a/setup.py b/setup.py +index 703f9d2..cc8abbd 100644 +--- a/setup.py ++++ b/setup.py +@@ -456,10 +456,6 @@ class BuildExt (build_ext): + ccflags = ext.extra_compile_args + linkflags = ext.extra_link_args + +- if sys.platform != "darwin" and not self.disable_openmp: +- linkflags.append(OPENMP_CFLAG) +- ccflags.append(OPENMP_LDFLAG) +- + if self.debug: + skip = ["-DNDEBUG"] + ccflags[:] = [f for f in ccflags if f not in skip] diff --git a/media-gfx/mypaint/mypaint-2.0.1.ebuild b/media-gfx/mypaint/mypaint-2.0.1.ebuild index ac43f1303cf..1ca2e261568 100644 --- a/media-gfx/mypaint/mypaint-2.0.1.ebuild +++ b/media-gfx/mypaint/mypaint-2.0.1.ebuild @@ -50,6 +50,11 @@ PATCHES=( distutils_enable_tests setup.py +# TODO: Allow openmp support (patched out) +# There's no urgency on this given that it currently +# breaks runtime use [0] +# [0] https://github.com/mypaint/mypaint/issues/1107. + src_install() { distutils-r1_src_install