[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/ - gentoo-commits

From:	Lars Wendler <polynomial-c@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
Date:	Fri, 10 Jan 2020 11:24:26
Message-Id:	`1578655309.c84572164618637ab7528a9a95946b6bc39d0eb5.polynomial-c@gentoo`

1

commit:     c84572164618637ab7528a9a95946b6bc39d0eb5

2

Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>

3

AuthorDate: Fri Jan 10 11:21:32 2020 +0000

4

Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>

5

CommitDate: Fri Jan 10 11:21:49 2020 +0000

6

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

7

8

sys-apps/util-linux: Fixed cross-compilation

9

10

Closes: https://bugs.gentoo.org/654034

11

Package-Manager: Portage-2.3.84, Repoman-2.3.20

12

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

13

14

 sys-apps/util-linux/util-linux-2.33.2.ebuild   | 10 ++++------

15

 sys-apps/util-linux/util-linux-2.34-r3.ebuild  | 10 ++++------

16

 sys-apps/util-linux/util-linux-2.35_rc2.ebuild | 10 ++++------

17

 sys-apps/util-linux/util-linux-9999.ebuild     | 10 ++++------

18

 4 files changed, 16 insertions(+), 24 deletions(-)

19

20

diff --git a/sys-apps/util-linux/util-linux-2.33.2.ebuild b/sys-apps/util-linux/util-linux-2.33.2.ebuild

21

index 1a720970cc0..8e0e60b9c32 100644

22

--- a/sys-apps/util-linux/util-linux-2.33.2.ebuild

23

+++ b/sys-apps/util-linux/util-linux-2.33.2.ebuild

24

@@ -92,12 +92,6 @@ src_prepare() {

25

 		eautoreconf

26

fi

27

28

-	# Undo bad ncurses handling by upstream. #601530

29

-	sed -i -E \

30

-		-e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \

31

-		-e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \

32

-		configure || die

33

-

34

 	elibtoolize

35

}

36

37

@@ -143,6 +137,10 @@ multilib_src_configure() {

38

 	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486

39

 	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042

40

41

+	# Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530

42

+	export NCURSES6_CONFIG=false NCURSES5_CONFIG=false

43

+	export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false

44

+

45

 	local myeconfargs=(

46

 		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"

47

 		--with-bashcompletiondir="$(get_bashcompdir)"

48

49

diff --git a/sys-apps/util-linux/util-linux-2.34-r3.ebuild b/sys-apps/util-linux/util-linux-2.34-r3.ebuild

50

index 69560039913..18ce2051063 100644

51

--- a/sys-apps/util-linux/util-linux-2.34-r3.ebuild

52

+++ b/sys-apps/util-linux/util-linux-2.34-r3.ebuild

53

@@ -91,12 +91,6 @@ src_prepare() {

54

 		eautoreconf

55

fi

56

57

-	# Undo bad ncurses handling by upstream. #601530

58

-	sed -i -E \

59

-		-e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \

60

-		-e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \

61

-		configure || die

62

-

63

 	elibtoolize

64

}

65

66

@@ -143,6 +137,10 @@ multilib_src_configure() {

67

 	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486

68

 	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042

69

70

+	# Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530

71

+	export NCURSES6_CONFIG=false NCURSES5_CONFIG=false

72

+	export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false

73

+

74

 	# configure args shared by python and non-python builds

75

 	local commonargs=(

76

 		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"

77

78

diff --git a/sys-apps/util-linux/util-linux-2.35_rc2.ebuild b/sys-apps/util-linux/util-linux-2.35_rc2.ebuild

79

index cfaef772324..f1759d4eb6c 100644

80

--- a/sys-apps/util-linux/util-linux-2.35_rc2.ebuild

81

+++ b/sys-apps/util-linux/util-linux-2.35_rc2.ebuild

82

@@ -92,12 +92,6 @@ src_prepare() {

83

 		eautoreconf

84

fi

85

86

-	# Undo bad ncurses handling by upstream. #601530

87

-	sed -i -E \

88

-		-e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \

89

-		-e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \

90

-		configure || die

91

-

92

 	elibtoolize

93

}

94

95

@@ -144,6 +138,10 @@ multilib_src_configure() {

96

 	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486

97

 	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042

98

99

+	# Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530

100

+	export NCURSES6_CONFIG=false NCURSES5_CONFIG=false

101

+	export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false

102

+

103

 	# configure args shared by python and non-python builds

104

 	local commonargs=(

105

 		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"

106

107

diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild

108

index cfaef772324..f1759d4eb6c 100644

109

--- a/sys-apps/util-linux/util-linux-9999.ebuild

110

+++ b/sys-apps/util-linux/util-linux-9999.ebuild

111

@@ -92,12 +92,6 @@ src_prepare() {

112

 		eautoreconf

113

fi

114

115

-	# Undo bad ncurses handling by upstream. #601530

116

-	sed -i -E \

117

-		-e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \

118

-		-e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \

119

-		configure || die

120

-

121

 	elibtoolize

122

}

123

124

@@ -144,6 +138,10 @@ multilib_src_configure() {

125

 	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486

126

 	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042

127

128

+	# Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530

129

+	export NCURSES6_CONFIG=false NCURSES5_CONFIG=false

130

+	export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false

131

+

132

 	# configure args shared by python and non-python builds

133

 	local commonargs=(

134

 		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"

1	commit: c84572164618637ab7528a9a95946b6bc39d0eb5
2	Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3	AuthorDate: Fri Jan 10 11:21:32 2020 +0000
4	Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5	CommitDate: Fri Jan 10 11:21:49 2020 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8457216
7
8	sys-apps/util-linux: Fixed cross-compilation
9
10	Closes: https://bugs.gentoo.org/654034
11	Package-Manager: Portage-2.3.84, Repoman-2.3.20
12	Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
13
14	sys-apps/util-linux/util-linux-2.33.2.ebuild \| 10 ++++------
15	sys-apps/util-linux/util-linux-2.34-r3.ebuild \| 10 ++++------
16	sys-apps/util-linux/util-linux-2.35_rc2.ebuild \| 10 ++++------
17	sys-apps/util-linux/util-linux-9999.ebuild \| 10 ++++------
18	4 files changed, 16 insertions(+), 24 deletions(-)
19
20	diff --git a/sys-apps/util-linux/util-linux-2.33.2.ebuild b/sys-apps/util-linux/util-linux-2.33.2.ebuild
21	index 1a720970cc0..8e0e60b9c32 100644
22	--- a/sys-apps/util-linux/util-linux-2.33.2.ebuild
23	+++ b/sys-apps/util-linux/util-linux-2.33.2.ebuild
24	@@ -92,12 +92,6 @@ src_prepare() {
25	eautoreconf
26	fi
27
28	- # Undo bad ncurses handling by upstream. #601530
29	- sed -i -E \
30	- -e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
31	- -e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
32	- configure \|\| die
33	-
34	elibtoolize
35	}
36
37	@@ -143,6 +137,10 @@ multilib_src_configure() {
38	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
39	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
40
41	+ # Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530
42	+ export NCURSES6_CONFIG=false NCURSES5_CONFIG=false
43	+ export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false
44	+
45	local myeconfargs=(
46	--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
47	--with-bashcompletiondir="$(get_bashcompdir)"
48
49	diff --git a/sys-apps/util-linux/util-linux-2.34-r3.ebuild b/sys-apps/util-linux/util-linux-2.34-r3.ebuild
50	index 69560039913..18ce2051063 100644
51	--- a/sys-apps/util-linux/util-linux-2.34-r3.ebuild
52	+++ b/sys-apps/util-linux/util-linux-2.34-r3.ebuild
53	@@ -91,12 +91,6 @@ src_prepare() {
54	eautoreconf
55	fi
56
57	- # Undo bad ncurses handling by upstream. #601530
58	- sed -i -E \
59	- -e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
60	- -e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
61	- configure \|\| die
62	-
63	elibtoolize
64	}
65
66	@@ -143,6 +137,10 @@ multilib_src_configure() {
67	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
68	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
69
70	+ # Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530
71	+ export NCURSES6_CONFIG=false NCURSES5_CONFIG=false
72	+ export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false
73	+
74	# configure args shared by python and non-python builds
75	local commonargs=(
76	--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
77
78	diff --git a/sys-apps/util-linux/util-linux-2.35_rc2.ebuild b/sys-apps/util-linux/util-linux-2.35_rc2.ebuild
79	index cfaef772324..f1759d4eb6c 100644
80	--- a/sys-apps/util-linux/util-linux-2.35_rc2.ebuild
81	+++ b/sys-apps/util-linux/util-linux-2.35_rc2.ebuild
82	@@ -92,12 +92,6 @@ src_prepare() {
83	eautoreconf
84	fi
85
86	- # Undo bad ncurses handling by upstream. #601530
87	- sed -i -E \
88	- -e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
89	- -e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
90	- configure \|\| die
91	-
92	elibtoolize
93	}
94
95	@@ -144,6 +138,10 @@ multilib_src_configure() {
96	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
97	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
98
99	+ # Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530
100	+ export NCURSES6_CONFIG=false NCURSES5_CONFIG=false
101	+ export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false
102	+
103	# configure args shared by python and non-python builds
104	local commonargs=(
105	--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
106
107	diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
108	index cfaef772324..f1759d4eb6c 100644
109	--- a/sys-apps/util-linux/util-linux-9999.ebuild
110	+++ b/sys-apps/util-linux/util-linux-9999.ebuild
111	@@ -92,12 +92,6 @@ src_prepare() {
112	eautoreconf
113	fi
114
115	- # Undo bad ncurses handling by upstream. #601530
116	- sed -i -E \
117	- -e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
118	- -e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
119	- configure \|\| die
120	-
121	elibtoolize
122	}
123
124	@@ -144,6 +138,10 @@ multilib_src_configure() {
125	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
126	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
127
128	+ # Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530
129	+ export NCURSES6_CONFIG=false NCURSES5_CONFIG=false
130	+ export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false
131	+
132	# configure args shared by python and non-python builds
133	local commonargs=(
134	--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"

Gentoo Archives: gentoo-commits