[gentoo-commits] repo/gentoo:master commit in: dev-lang/python/ - gentoo-commits

From:	Sam James <sam@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: dev-lang/python/
Date:	Mon, 07 Nov 2022 08:03:13
Message-Id:	`1667807869.e5cb1ccc95873d55f9f643b043f3f7493fd31eee.sam@gentoo`

1

commit:     e5cb1ccc95873d55f9f643b043f3f7493fd31eee

2

Author:     Sam James <sam <AT> gentoo <DOT> org>

3

AuthorDate: Mon Nov  7 07:57:49 2022 +0000

4

Commit:     Sam James <sam <AT> gentoo <DOT> org>

5

CommitDate: Mon Nov  7 07:57:49 2022 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5cb1ccc

7

8

dev-lang/python: append ncurses include path after CBUILD Python is built

9

10

We don't want to contaminate the mini CBUILD Python cross build

11

with paths in SYSROOT.

12

13

Bug: https://bugs.gentoo.org/880059

14

Bug: https://bugs.gentoo.org/880137

15

Signed-off-by: Sam James <sam <AT> gentoo.org>

16

17

 dev-lang/python/python-3.10.8_p2.ebuild        | 10 +++++-----

18

 dev-lang/python/python-3.11.0_p1.ebuild        | 10 +++++-----

19

 dev-lang/python/python-3.12.0_alpha1_p1.ebuild | 10 +++++-----

20

 dev-lang/python/python-3.8.15_p2.ebuild        | 10 +++++-----

21

 dev-lang/python/python-3.9.15_p2.ebuild        | 10 +++++-----

22

 5 files changed, 25 insertions(+), 25 deletions(-)

23

24

diff --git a/dev-lang/python/python-3.10.8_p2.ebuild b/dev-lang/python/python-3.10.8_p2.ebuild

25

index b1ce528e225d..9430e1042550 100644

26

--- a/dev-lang/python/python-3.10.8_p2.ebuild

27

+++ b/dev-lang/python/python-3.10.8_p2.ebuild

28

@@ -166,11 +166,6 @@ src_configure() {

29

 	# PKG_CONFIG needed for cross.

30

 	tc-export CXX PKG_CONFIG

31

32

-	# Fix implicit declarations on cross and prefix builds. Bug #674070.

33

-	if use ncurses; then

34

-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw

35

-	fi

36

-

37

 	local dbmliborder=

38

 	if use gdbm; then

39

 		dbmliborder+="${dbmliborder:+:}gdbm"

40

@@ -289,6 +284,11 @@ src_configure() {

41

 	local -x LDFLAGS_NODIST=${LDFLAGS}

42

 	local -x CFLAGS= LDFLAGS=

43

44

+	# Fix implicit declarations on cross and prefix builds. Bug #674070.

45

+	if use ncurses; then

46

+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw

47

+	fi

48

+

49

 	econf "${myeconfargs[@]}"

50

51

 	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then

52

53

diff --git a/dev-lang/python/python-3.11.0_p1.ebuild b/dev-lang/python/python-3.11.0_p1.ebuild

54

index b13b791e8dff..261ca987064c 100644

55

--- a/dev-lang/python/python-3.11.0_p1.ebuild

56

+++ b/dev-lang/python/python-3.11.0_p1.ebuild

57

@@ -153,11 +153,6 @@ src_configure() {

58

 	# PKG_CONFIG needed for cross.

59

 	tc-export CXX PKG_CONFIG

60

61

-	# Fix implicit declarations on cross and prefix builds. Bug #674070.

62

-	if use ncurses; then

63

-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw

64

-	fi

65

-

66

 	local dbmliborder=

67

 	if use gdbm; then

68

 		dbmliborder+="${dbmliborder:+:}gdbm"

69

@@ -281,6 +276,11 @@ src_configure() {

70

 	local -x LDFLAGS_NODIST=${LDFLAGS}

71

 	local -x CFLAGS= LDFLAGS=

72

73

+	# Fix implicit declarations on cross and prefix builds. Bug #674070.

74

+	if use ncurses; then

75

+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw

76

+	fi

77

+

78

 	econf "${myeconfargs[@]}"

79

80

 	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then

81

82

diff --git a/dev-lang/python/python-3.12.0_alpha1_p1.ebuild b/dev-lang/python/python-3.12.0_alpha1_p1.ebuild

83

index 8d748fa37b67..15f03994af05 100644

84

--- a/dev-lang/python/python-3.12.0_alpha1_p1.ebuild

85

+++ b/dev-lang/python/python-3.12.0_alpha1_p1.ebuild

86

@@ -149,11 +149,6 @@ src_configure() {

87

 	# PKG_CONFIG needed for cross.

88

 	tc-export CXX PKG_CONFIG

89

90

-	# Fix implicit declarations on cross and prefix builds. Bug #674070.

91

-	if use ncurses; then

92

-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw

93

-	fi

94

-

95

 	local dbmliborder=

96

 	if use gdbm; then

97

 		dbmliborder+="${dbmliborder:+:}gdbm"

98

@@ -270,6 +265,11 @@ src_configure() {

99

 		popd &> /dev/null || die

100

fi

101

102

+        # Fix implicit declarations on cross and prefix builds. Bug #674070.

103

+	if use ncurses; then

104

+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw

105

+	fi

106

+

107

 	econf "${myeconfargs[@]}"

108

109

 	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then

110

111

diff --git a/dev-lang/python/python-3.8.15_p2.ebuild b/dev-lang/python/python-3.8.15_p2.ebuild

112

index f03d22173cd6..649ae9032e52 100644

113

--- a/dev-lang/python/python-3.8.15_p2.ebuild

114

+++ b/dev-lang/python/python-3.8.15_p2.ebuild

115

@@ -152,11 +152,6 @@ src_configure() {

116

 	# PKG_CONFIG needed for cross.

117

 	tc-export CXX PKG_CONFIG

118

119

-	# Fix implicit declarations on cross and prefix builds. Bug #674070.

120

-	if use ncurses; then

121

-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw

122

-	fi

123

-

124

 	local dbmliborder=

125

 	if use gdbm; then

126

 		dbmliborder+="${dbmliborder:+:}gdbm"

127

@@ -242,6 +237,11 @@ src_configure() {

128

 	local -x LDFLAGS_NODIST=${LDFLAGS}

129

 	local -x CFLAGS= LDFLAGS=

130

131

+	# Fix implicit declarations on cross and prefix builds. Bug #674070.

132

+	if use ncurses; then

133

+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw

134

+	fi

135

+

136

 	econf "${myeconfargs[@]}"

137

138

 	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then

139

140

diff --git a/dev-lang/python/python-3.9.15_p2.ebuild b/dev-lang/python/python-3.9.15_p2.ebuild

141

index d5d9a2e273eb..b55a6f73b915 100644

142

--- a/dev-lang/python/python-3.9.15_p2.ebuild

143

+++ b/dev-lang/python/python-3.9.15_p2.ebuild

144

@@ -162,11 +162,6 @@ src_configure() {

145

 	# PKG_CONFIG needed for cross.

146

 	tc-export CXX PKG_CONFIG

147

148

-	# Fix implicit declarations on cross and prefix builds. Bug #674070.

149

-	if use ncurses; then

150

-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw

151

-	fi

152

-

153

 	local dbmliborder=

154

 	if use gdbm; then

155

 		dbmliborder+="${dbmliborder:+:}gdbm"

156

@@ -283,6 +278,11 @@ src_configure() {

157

 	local -x LDFLAGS_NODIST=${LDFLAGS}

158

 	local -x CFLAGS= LDFLAGS=

159

160

+	# Fix implicit declarations on cross and prefix builds. Bug #674070.

161

+	if use ncurses; then

162

+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw

163

+	fi

164

+

165

 	econf "${myeconfargs[@]}"

166

167

 	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then

1	commit: e5cb1ccc95873d55f9f643b043f3f7493fd31eee
2	Author: Sam James <sam <AT> gentoo <DOT> org>
3	AuthorDate: Mon Nov 7 07:57:49 2022 +0000
4	Commit: Sam James <sam <AT> gentoo <DOT> org>
5	CommitDate: Mon Nov 7 07:57:49 2022 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5cb1ccc
7
8	dev-lang/python: append ncurses include path after CBUILD Python is built
9
10	We don't want to contaminate the mini CBUILD Python cross build
11	with paths in SYSROOT.
12
13	Bug: https://bugs.gentoo.org/880059
14	Bug: https://bugs.gentoo.org/880137
15	Signed-off-by: Sam James <sam <AT> gentoo.org>
16
17	dev-lang/python/python-3.10.8_p2.ebuild \| 10 +++++-----
18	dev-lang/python/python-3.11.0_p1.ebuild \| 10 +++++-----
19	dev-lang/python/python-3.12.0_alpha1_p1.ebuild \| 10 +++++-----
20	dev-lang/python/python-3.8.15_p2.ebuild \| 10 +++++-----
21	dev-lang/python/python-3.9.15_p2.ebuild \| 10 +++++-----
22	5 files changed, 25 insertions(+), 25 deletions(-)
23
24	diff --git a/dev-lang/python/python-3.10.8_p2.ebuild b/dev-lang/python/python-3.10.8_p2.ebuild
25	index b1ce528e225d..9430e1042550 100644
26	--- a/dev-lang/python/python-3.10.8_p2.ebuild
27	+++ b/dev-lang/python/python-3.10.8_p2.ebuild
28	@@ -166,11 +166,6 @@ src_configure() {
29	# PKG_CONFIG needed for cross.
30	tc-export CXX PKG_CONFIG
31
32	- # Fix implicit declarations on cross and prefix builds. Bug #674070.
33	- if use ncurses; then
34	- append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
35	- fi
36	-
37	local dbmliborder=
38	if use gdbm; then
39	dbmliborder+="${dbmliborder:+:}gdbm"
40	@@ -289,6 +284,11 @@ src_configure() {
41	local -x LDFLAGS_NODIST=${LDFLAGS}
42	local -x CFLAGS= LDFLAGS=
43
44	+ # Fix implicit declarations on cross and prefix builds. Bug #674070.
45	+ if use ncurses; then
46	+ append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
47	+ fi
48	+
49	econf "${myeconfargs[@]}"
50
51	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
52
53	diff --git a/dev-lang/python/python-3.11.0_p1.ebuild b/dev-lang/python/python-3.11.0_p1.ebuild
54	index b13b791e8dff..261ca987064c 100644
55	--- a/dev-lang/python/python-3.11.0_p1.ebuild
56	+++ b/dev-lang/python/python-3.11.0_p1.ebuild
57	@@ -153,11 +153,6 @@ src_configure() {
58	# PKG_CONFIG needed for cross.
59	tc-export CXX PKG_CONFIG
60
61	- # Fix implicit declarations on cross and prefix builds. Bug #674070.
62	- if use ncurses; then
63	- append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
64	- fi
65	-
66	local dbmliborder=
67	if use gdbm; then
68	dbmliborder+="${dbmliborder:+:}gdbm"
69	@@ -281,6 +276,11 @@ src_configure() {
70	local -x LDFLAGS_NODIST=${LDFLAGS}
71	local -x CFLAGS= LDFLAGS=
72
73	+ # Fix implicit declarations on cross and prefix builds. Bug #674070.
74	+ if use ncurses; then
75	+ append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
76	+ fi
77	+
78	econf "${myeconfargs[@]}"
79
80	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
81
82	diff --git a/dev-lang/python/python-3.12.0_alpha1_p1.ebuild b/dev-lang/python/python-3.12.0_alpha1_p1.ebuild
83	index 8d748fa37b67..15f03994af05 100644
84	--- a/dev-lang/python/python-3.12.0_alpha1_p1.ebuild
85	+++ b/dev-lang/python/python-3.12.0_alpha1_p1.ebuild
86	@@ -149,11 +149,6 @@ src_configure() {
87	# PKG_CONFIG needed for cross.
88	tc-export CXX PKG_CONFIG
89
90	- # Fix implicit declarations on cross and prefix builds. Bug #674070.
91	- if use ncurses; then
92	- append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
93	- fi
94	-
95	local dbmliborder=
96	if use gdbm; then
97	dbmliborder+="${dbmliborder:+:}gdbm"
98	@@ -270,6 +265,11 @@ src_configure() {
99	popd &> /dev/null \|\| die
100	fi
101
102	+ # Fix implicit declarations on cross and prefix builds. Bug #674070.
103	+ if use ncurses; then
104	+ append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
105	+ fi
106	+
107	econf "${myeconfargs[@]}"
108
109	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
110
111	diff --git a/dev-lang/python/python-3.8.15_p2.ebuild b/dev-lang/python/python-3.8.15_p2.ebuild
112	index f03d22173cd6..649ae9032e52 100644
113	--- a/dev-lang/python/python-3.8.15_p2.ebuild
114	+++ b/dev-lang/python/python-3.8.15_p2.ebuild
115	@@ -152,11 +152,6 @@ src_configure() {
116	# PKG_CONFIG needed for cross.
117	tc-export CXX PKG_CONFIG
118
119	- # Fix implicit declarations on cross and prefix builds. Bug #674070.
120	- if use ncurses; then
121	- append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
122	- fi
123	-
124	local dbmliborder=
125	if use gdbm; then
126	dbmliborder+="${dbmliborder:+:}gdbm"
127	@@ -242,6 +237,11 @@ src_configure() {
128	local -x LDFLAGS_NODIST=${LDFLAGS}
129	local -x CFLAGS= LDFLAGS=
130
131	+ # Fix implicit declarations on cross and prefix builds. Bug #674070.
132	+ if use ncurses; then
133	+ append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
134	+ fi
135	+
136	econf "${myeconfargs[@]}"
137
138	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
139
140	diff --git a/dev-lang/python/python-3.9.15_p2.ebuild b/dev-lang/python/python-3.9.15_p2.ebuild
141	index d5d9a2e273eb..b55a6f73b915 100644
142	--- a/dev-lang/python/python-3.9.15_p2.ebuild
143	+++ b/dev-lang/python/python-3.9.15_p2.ebuild
144	@@ -162,11 +162,6 @@ src_configure() {
145	# PKG_CONFIG needed for cross.
146	tc-export CXX PKG_CONFIG
147
148	- # Fix implicit declarations on cross and prefix builds. Bug #674070.
149	- if use ncurses; then
150	- append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
151	- fi
152	-
153	local dbmliborder=
154	if use gdbm; then
155	dbmliborder+="${dbmliborder:+:}gdbm"
156	@@ -283,6 +278,11 @@ src_configure() {
157	local -x LDFLAGS_NODIST=${LDFLAGS}
158	local -x CFLAGS= LDFLAGS=
159
160	+ # Fix implicit declarations on cross and prefix builds. Bug #674070.
161	+ if use ncurses; then
162	+ append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
163	+ fi
164	+
165	econf "${myeconfargs[@]}"
166
167	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then

Gentoo Archives: gentoo-commits