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 B302B138334 for ; Fri, 20 Jul 2018 19:33:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 58E07E0A4A; Fri, 20 Jul 2018 19:33:50 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 1BA1DE0A4A for ; Fri, 20 Jul 2018 19:33:47 +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 F30E6335CD2 for ; Fri, 20 Jul 2018 19:33:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BF020353 for ; Fri, 20 Jul 2018 19:33:41 +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: <1532115152.81e465561bd76a45d2da3cf57293c58649f9198b.vdupras@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pillow/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pillow/pillow-4.3.0-r2.ebuild dev-python/pillow/pillow-5.2.0.ebuild X-VCS-Directories: dev-python/pillow/ X-VCS-Committer: vdupras X-VCS-Committer-Name: Virgil Dupras X-VCS-Revision: 81e465561bd76a45d2da3cf57293c58649f9198b X-VCS-Branch: master Date: Fri, 20 Jul 2018 19:33:41 +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: d6650fb3-8fa5-42c9-abe0-5a69b4f68deb X-Archives-Hash: 7284bd5ac4b702dd45b95e7ece01a16e commit: 81e465561bd76a45d2da3cf57293c58649f9198b Author: Virgil Dupras gentoo org> AuthorDate: Fri Jul 20 19:32:32 2018 +0000 Commit: Virgil Dupras gentoo org> CommitDate: Fri Jul 20 19:32:32 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81e46556 dev-python/pillow: fix broken build process In 4.3.0 and 5.2.0, we had a broken way of passing flags to Pillow's build script. Flags would be passed fine in the compile phase, but would not be passed at all at the install phase, whichwas the equivalent of not sending flags at all. I'm committing straight to stable to 4.3.0-r2 because the build process is broken. Closes: https://bugs.gentoo.org/661308 Package-Manager: Portage-2.3.43, Repoman-2.3.10 dev-python/pillow/pillow-4.3.0-r2.ebuild | 10 +++++----- dev-python/pillow/pillow-5.2.0.ebuild | 8 +++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dev-python/pillow/pillow-4.3.0-r2.ebuild b/dev-python/pillow/pillow-4.3.0-r2.ebuild index e6169726869..25dddfce611 100644 --- a/dev-python/pillow/pillow-4.3.0-r2.ebuild +++ b/dev-python/pillow/pillow-4.3.0-r2.ebuild @@ -52,10 +52,11 @@ PATCHES=( "${FILESDIR}"/pillow-4.3.0-freetype2.9-test-metrics.patch ) -python_compile() { - # raqm not in portage yet - local args=( - --disable-raqm +python_configure_all() { + # It's important that these flags are also passed during the install phase + # as well. Make sure of that if you change the lines below. See bug 661308. + mydistutilsargs=( + build_ext --disable-platform-guessing $(use_enable truetype freetype) $(use_enable jpeg) @@ -67,7 +68,6 @@ python_compile() { $(use_enable webp webpmux) $(use_enable zlib) ) - distutils-r1_python_compile build_ext "${args[@]}" } python_compile_all() { diff --git a/dev-python/pillow/pillow-5.2.0.ebuild b/dev-python/pillow/pillow-5.2.0.ebuild index ad0c8bde22b..1476c3915c5 100644 --- a/dev-python/pillow/pillow-5.2.0.ebuild +++ b/dev-python/pillow/pillow-5.2.0.ebuild @@ -46,8 +46,11 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${MY_P}" -python_compile() { - local args=( +python_configure_all() { + # It's important that these flags are also passed during the install phase + # as well. Make sure of that if you change the lines below. See bug 661308. + mydistutilsargs=( + build_ext --disable-platform-guessing $(use_enable truetype freetype) $(use_enable jpeg) @@ -59,7 +62,6 @@ python_compile() { $(use_enable webp webpmux) $(use_enable zlib) ) - distutils-r1_python_compile build_ext "${args[@]}" } python_compile_all() {