From 3a717f84615e7bac2566e174e7bcdd2c94099d2d Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Fri, 23 Sep 2016 21:11:34 -0400 Subject: [PATCH] dev-lang/python: set LC_ALL=C in src_compile Package-Manager: portage-2.3.0_p43 --- dev-lang/python/python-2.7.10-r1.ebuild | 4 ---- dev-lang/python/python-2.7.12.ebuild | 4 ---- dev-lang/python/python-3.4.3-r1.ebuild | 8 ++++---- dev-lang/python/python-3.4.5.ebuild | 8 ++++---- dev-lang/python/python-3.5.2.ebuild | 8 ++++---- 5 files changed, 12 insertions(+), 20 deletions(-) diff --git a/dev-lang/python/python-2.7.10-r1.ebuild b/dev-lang/python/python-2.7.10-r1.ebuild index 180d7beeaa5b..de85de70feb8 100644 --- a/dev-lang/python/python-2.7.10-r1.ebuild +++ b/dev-lang/python/python-2.7.10-r1.ebuild @@ -146,10 +146,6 @@ src_configure() { einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" fi - # Ensure sed works as expected - # https://bugs.gentoo.org/594768 - export LC_COLLATE=C - if [[ "$(gcc-major-version)" -ge 4 ]]; then append-flags -fwrapv fi diff --git a/dev-lang/python/python-2.7.12.ebuild b/dev-lang/python/python-2.7.12.ebuild index 1066b16c21cf..0856ef255289 100644 --- a/dev-lang/python/python-2.7.12.ebuild +++ b/dev-lang/python/python-2.7.12.ebuild @@ -144,10 +144,6 @@ src_configure() { einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" fi - # Ensure sed works as expected - # https://bugs.gentoo.org/594768 - export LC_COLLATE=C - if [[ "$(gcc-major-version)" -ge 4 ]]; then append-flags -fwrapv fi diff --git a/dev-lang/python/python-3.4.3-r1.ebuild b/dev-lang/python/python-3.4.3-r1.ebuild index 67492b30bbfc..43e136944bea 100644 --- a/dev-lang/python/python-3.4.3-r1.ebuild +++ b/dev-lang/python/python-3.4.3-r1.ebuild @@ -115,10 +115,6 @@ src_configure() { einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" fi - # Ensure sed works as expected - # https://bugs.gentoo.org/594768 - export LC_COLLATE=C - if [[ "$(gcc-major-version)" -ge 4 ]]; then append-flags -fwrapv fi @@ -177,6 +173,10 @@ src_configure() { } src_compile() { + # Ensure sed works as expected + # https://bugs.gentoo.org/594768 + local -x LC_ALL=C + # Avoid invoking pgen for cross-compiles. touch Include/graminit.h Python/graminit.c || die diff --git a/dev-lang/python/python-3.4.5.ebuild b/dev-lang/python/python-3.4.5.ebuild index 860da679f226..f5c7f7d72247 100644 --- a/dev-lang/python/python-3.4.5.ebuild +++ b/dev-lang/python/python-3.4.5.ebuild @@ -112,10 +112,6 @@ src_configure() { einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" fi - # Ensure sed works as expected - # https://bugs.gentoo.org/594768 - export LC_COLLATE=C - if [[ "$(gcc-major-version)" -ge 4 ]]; then append-flags -fwrapv fi @@ -173,6 +169,10 @@ src_configure() { } src_compile() { + # Ensure sed works as expected + # https://bugs.gentoo.org/594768 + local -x LC_ALL=C + # Avoid invoking pgen for cross-compiles. touch Include/graminit.h Python/graminit.c || die diff --git a/dev-lang/python/python-3.5.2.ebuild b/dev-lang/python/python-3.5.2.ebuild index 4875c2d15d28..0dfc3504b209 100644 --- a/dev-lang/python/python-3.5.2.ebuild +++ b/dev-lang/python/python-3.5.2.ebuild @@ -111,10 +111,6 @@ src_configure() { einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" fi - # Ensure sed works as expected - # https://bugs.gentoo.org/594768 - export LC_COLLATE=C - if [[ "$(gcc-major-version)" -ge 4 ]]; then append-flags -fwrapv fi @@ -174,6 +170,10 @@ src_configure() { } src_compile() { + # Ensure sed works as expected + # https://bugs.gentoo.org/594768 + local -x LC_ALL=C + cd "${BUILD_DIR}" || die emake CPPFLAGS= CFLAGS= LDFLAGS= -- 2.26.2