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 65B64138334 for ; Fri, 7 Sep 2018 18:46:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4976EE082B; Fri, 7 Sep 2018 18:46:19 +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 11C13E082B for ; Fri, 7 Sep 2018 18:46:18 +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 6AABE335CD5 for ; Fri, 7 Sep 2018 18:46:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 80FA13CC for ; Fri, 7 Sep 2018 18:46:15 +0000 (UTC) From: "Virgil Dupras" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Virgil Dupras" Message-ID: <1536345931.33875ec2cd5306aad166cb0e5202f6342c3a2f95.vdupras@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pillow/files/, dev-python/pillow/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pillow/files/pillow-5.2.0-fix-lib-paths.patch dev-python/pillow/files/pillow-5.2.0-no-usr-lib.patch dev-python/pillow/pillow-5.2.0.ebuild X-VCS-Directories: dev-python/pillow/files/ dev-python/pillow/ X-VCS-Committer: vdupras X-VCS-Committer-Name: Virgil Dupras X-VCS-Revision: 33875ec2cd5306aad166cb0e5202f6342c3a2f95 X-VCS-Branch: master Date: Fri, 7 Sep 2018 18:46:15 +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-Archives-Salt: 4c44b3c5-d50a-45d6-86c8-502c91369bf6 X-Archives-Hash: 3a4194a9e967536e544f4d8f67adc9fc commit: 33875ec2cd5306aad166cb0e5202f6342c3a2f95 Author: Virgil Dupras gentoo org> AuthorDate: Fri Sep 7 18:43:59 2018 +0000 Commit: Virgil Dupras gentoo org> CommitDate: Fri Sep 7 18:45:31 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33875ec2 dev-python/pillow: re-support pypy pypy support had been dropped in pillow 4.3 ebuild and is being re-introduced now. Tests pass. This required a little bit of library path fiddling in setup.py, the root cause of it being that `sysconfig.get_config_var('prefix')` under pypy doesn't return the same thing as with CPython. This fiddling was required if we wanted to keep the --disable-platform-guessing flag. I tried not to break the fix that was done in bug 661830. I've tried pypy3, but not all tests passed. I didn't investigate further (I'm just trying to return to pre-4.3 levels so that we can stabilize) Bug: https://bugs.gentoo.org/661830 Closes: https://bugs.gentoo.org/608620 Package-Manager: Portage-2.3.49, Repoman-2.3.10 dev-python/pillow/files/pillow-5.2.0-fix-lib-paths.patch | 16 ++++++++++++++++ dev-python/pillow/files/pillow-5.2.0-no-usr-lib.patch | 12 ------------ dev-python/pillow/pillow-5.2.0.ebuild | 4 ++-- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dev-python/pillow/files/pillow-5.2.0-fix-lib-paths.patch b/dev-python/pillow/files/pillow-5.2.0-fix-lib-paths.patch new file mode 100644 index 00000000000..b73681831a6 --- /dev/null +++ b/dev-python/pillow/files/pillow-5.2.0-fix-lib-paths.patch @@ -0,0 +1,16 @@ +diff --git a/setup.py b/setup.py +index 761d552c..c4a55092 100755 +--- a/setup.py ++++ b/setup.py +@@ -435,6 +435,11 @@ class pil_build_ext(build_ext): + _add_directory(include_dirs, + os.path.join(best_path, 'include')) + ++ # The logic above fails in many cases (such as pypy builds) and we fix ++ # it here by making sure we look in standard places first. ++ library_dirs = ['/usr/lib64', '/usr/lib'] + library_dirs ++ include_dirs = ['/usr/include'] + include_dirs ++ + # + # insert new dirs *before* default libs, to avoid conflicts + # between Python PYD stub libs and real libraries diff --git a/dev-python/pillow/files/pillow-5.2.0-no-usr-lib.patch b/dev-python/pillow/files/pillow-5.2.0-no-usr-lib.patch deleted file mode 100644 index 4b6cc50eaf5..00000000000 --- a/dev-python/pillow/files/pillow-5.2.0-no-usr-lib.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/setup.py 2018-07-22 22:09:23.840195059 +0300 -+++ a/setup.py 2018-07-22 22:11:43.400626135 +0300 -@@ -258,9 +258,8 @@ - _add_directory(library_dirs, d) - - prefix = sysconfig.get_config_var("prefix") - if prefix: -- _add_directory(library_dirs, os.path.join(prefix, "lib")) - _add_directory(include_dirs, os.path.join(prefix, "include")) - - # - # add platform directories diff --git a/dev-python/pillow/pillow-5.2.0.ebuild b/dev-python/pillow/pillow-5.2.0.ebuild index 406d711de0d..04ae4108561 100644 --- a/dev-python/pillow/pillow-5.2.0.ebuild +++ b/dev-python/pillow/pillow-5.2.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) +PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy ) PYTHON_REQ_USE='tk?,threads(+)' inherit distutils-r1 virtualx @@ -47,7 +47,7 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${MY_P}" PATCHES=( - "${FILESDIR}/${PN}-5.2.0-no-usr-lib.patch" + "${FILESDIR}/${PN}-5.2.0-fix-lib-paths.patch" ) python_configure_all() {