1 |
commit: 3a717f84615e7bac2566e174e7bcdd2c94099d2d |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 24 01:11:34 2016 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 24 01:11:45 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a717f84 |
7 |
|
8 |
dev-lang/python: set LC_ALL=C in src_compile |
9 |
|
10 |
Package-Manager: portage-2.3.0_p43 |
11 |
|
12 |
dev-lang/python/python-2.7.10-r1.ebuild | 4 ---- |
13 |
dev-lang/python/python-2.7.12.ebuild | 4 ---- |
14 |
dev-lang/python/python-3.4.3-r1.ebuild | 8 ++++---- |
15 |
dev-lang/python/python-3.4.5.ebuild | 8 ++++---- |
16 |
dev-lang/python/python-3.5.2.ebuild | 8 ++++---- |
17 |
5 files changed, 12 insertions(+), 20 deletions(-) |
18 |
|
19 |
diff --git a/dev-lang/python/python-2.7.10-r1.ebuild b/dev-lang/python/python-2.7.10-r1.ebuild |
20 |
index 180d7be..de85de7 100644 |
21 |
--- a/dev-lang/python/python-2.7.10-r1.ebuild |
22 |
+++ b/dev-lang/python/python-2.7.10-r1.ebuild |
23 |
@@ -146,10 +146,6 @@ src_configure() { |
24 |
einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" |
25 |
fi |
26 |
|
27 |
- # Ensure sed works as expected |
28 |
- # https://bugs.gentoo.org/594768 |
29 |
- export LC_COLLATE=C |
30 |
- |
31 |
if [[ "$(gcc-major-version)" -ge 4 ]]; then |
32 |
append-flags -fwrapv |
33 |
fi |
34 |
|
35 |
diff --git a/dev-lang/python/python-2.7.12.ebuild b/dev-lang/python/python-2.7.12.ebuild |
36 |
index 1066b16..0856ef2 100644 |
37 |
--- a/dev-lang/python/python-2.7.12.ebuild |
38 |
+++ b/dev-lang/python/python-2.7.12.ebuild |
39 |
@@ -144,10 +144,6 @@ src_configure() { |
40 |
einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" |
41 |
fi |
42 |
|
43 |
- # Ensure sed works as expected |
44 |
- # https://bugs.gentoo.org/594768 |
45 |
- export LC_COLLATE=C |
46 |
- |
47 |
if [[ "$(gcc-major-version)" -ge 4 ]]; then |
48 |
append-flags -fwrapv |
49 |
fi |
50 |
|
51 |
diff --git a/dev-lang/python/python-3.4.3-r1.ebuild b/dev-lang/python/python-3.4.3-r1.ebuild |
52 |
index 67492b3..43e1369 100644 |
53 |
--- a/dev-lang/python/python-3.4.3-r1.ebuild |
54 |
+++ b/dev-lang/python/python-3.4.3-r1.ebuild |
55 |
@@ -115,10 +115,6 @@ src_configure() { |
56 |
einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" |
57 |
fi |
58 |
|
59 |
- # Ensure sed works as expected |
60 |
- # https://bugs.gentoo.org/594768 |
61 |
- export LC_COLLATE=C |
62 |
- |
63 |
if [[ "$(gcc-major-version)" -ge 4 ]]; then |
64 |
append-flags -fwrapv |
65 |
fi |
66 |
@@ -177,6 +173,10 @@ src_configure() { |
67 |
} |
68 |
|
69 |
src_compile() { |
70 |
+ # Ensure sed works as expected |
71 |
+ # https://bugs.gentoo.org/594768 |
72 |
+ local -x LC_ALL=C |
73 |
+ |
74 |
# Avoid invoking pgen for cross-compiles. |
75 |
touch Include/graminit.h Python/graminit.c || die |
76 |
|
77 |
|
78 |
diff --git a/dev-lang/python/python-3.4.5.ebuild b/dev-lang/python/python-3.4.5.ebuild |
79 |
index 860da67..f5c7f7d 100644 |
80 |
--- a/dev-lang/python/python-3.4.5.ebuild |
81 |
+++ b/dev-lang/python/python-3.4.5.ebuild |
82 |
@@ -112,10 +112,6 @@ src_configure() { |
83 |
einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" |
84 |
fi |
85 |
|
86 |
- # Ensure sed works as expected |
87 |
- # https://bugs.gentoo.org/594768 |
88 |
- export LC_COLLATE=C |
89 |
- |
90 |
if [[ "$(gcc-major-version)" -ge 4 ]]; then |
91 |
append-flags -fwrapv |
92 |
fi |
93 |
@@ -173,6 +169,10 @@ src_configure() { |
94 |
} |
95 |
|
96 |
src_compile() { |
97 |
+ # Ensure sed works as expected |
98 |
+ # https://bugs.gentoo.org/594768 |
99 |
+ local -x LC_ALL=C |
100 |
+ |
101 |
# Avoid invoking pgen for cross-compiles. |
102 |
touch Include/graminit.h Python/graminit.c || die |
103 |
|
104 |
|
105 |
diff --git a/dev-lang/python/python-3.5.2.ebuild b/dev-lang/python/python-3.5.2.ebuild |
106 |
index 4875c2d..0dfc350 100644 |
107 |
--- a/dev-lang/python/python-3.5.2.ebuild |
108 |
+++ b/dev-lang/python/python-3.5.2.ebuild |
109 |
@@ -111,10 +111,6 @@ src_configure() { |
110 |
einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" |
111 |
fi |
112 |
|
113 |
- # Ensure sed works as expected |
114 |
- # https://bugs.gentoo.org/594768 |
115 |
- export LC_COLLATE=C |
116 |
- |
117 |
if [[ "$(gcc-major-version)" -ge 4 ]]; then |
118 |
append-flags -fwrapv |
119 |
fi |
120 |
@@ -174,6 +170,10 @@ src_configure() { |
121 |
} |
122 |
|
123 |
src_compile() { |
124 |
+ # Ensure sed works as expected |
125 |
+ # https://bugs.gentoo.org/594768 |
126 |
+ local -x LC_ALL=C |
127 |
+ |
128 |
cd "${BUILD_DIR}" || die |
129 |
|
130 |
emake CPPFLAGS= CFLAGS= LDFLAGS= |