1 |
commit: 128b67b00ebf59a18d47cbdaec3d7346ccd2932a |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 1 20:07:19 2022 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 1 20:07:19 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=128b67b0 |
7 |
|
8 |
sys-apps/busybox: remove uclibc |
9 |
|
10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
11 |
|
12 |
sys-apps/busybox/busybox-1.32.1-r1.ebuild | 10 ++-------- |
13 |
sys-apps/busybox/busybox-1.33.1-r2.ebuild | 10 ++-------- |
14 |
sys-apps/busybox/busybox-1.33.1.ebuild | 10 ++-------- |
15 |
sys-apps/busybox/busybox-1.34.1.ebuild | 10 ++-------- |
16 |
sys-apps/busybox/busybox-9999.ebuild | 10 ++-------- |
17 |
5 files changed, 10 insertions(+), 40 deletions(-) |
18 |
|
19 |
diff --git a/sys-apps/busybox/busybox-1.32.1-r1.ebuild b/sys-apps/busybox/busybox-1.32.1-r1.ebuild |
20 |
index 1c5b765c9cfb..962ff5a9bfeb 100644 |
21 |
--- a/sys-apps/busybox/busybox-1.32.1-r1.ebuild |
22 |
+++ b/sys-apps/busybox/busybox-1.32.1-r1.ebuild |
23 |
@@ -1,4 +1,4 @@ |
24 |
-# Copyright 1999-2021 Gentoo Authors |
25 |
+# Copyright 1999-2022 Gentoo Authors |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
|
28 |
# See `man savedconfig.eclass` for info on how to use USE=savedconfig. |
29 |
@@ -141,7 +141,7 @@ src_configure() { |
30 |
busybox_config_option n FEATURE_VI_REGEX_SEARCH |
31 |
fi |
32 |
|
33 |
- # If these are not set and we are using a uclibc/busybox setup |
34 |
+ # If these are not set and we are using a busybox setup |
35 |
# all calls to system() will fail. |
36 |
busybox_config_option y ASH |
37 |
busybox_config_option y SH_IS_ASH |
38 |
@@ -165,12 +165,6 @@ src_configure() { |
39 |
busybox_config_option systemd FEATURE_SYSTEMD |
40 |
busybox_config_option math FEATURE_AWK_LIBM |
41 |
|
42 |
- # disable features that uClibc doesn't (yet?) provide. |
43 |
- if use elibc_uclibc; then |
44 |
- busybox_config_option n FEATURE_SYNC_FANCY #567598 |
45 |
- busybox_config_option n NSENTER |
46 |
- fi |
47 |
- |
48 |
# all the debug options are compiler related, so punt them |
49 |
busybox_config_option n DEBUG_SANITIZE |
50 |
busybox_config_option n DEBUG |
51 |
|
52 |
diff --git a/sys-apps/busybox/busybox-1.33.1-r2.ebuild b/sys-apps/busybox/busybox-1.33.1-r2.ebuild |
53 |
index 4f79e3d15633..169995d3ca48 100644 |
54 |
--- a/sys-apps/busybox/busybox-1.33.1-r2.ebuild |
55 |
+++ b/sys-apps/busybox/busybox-1.33.1-r2.ebuild |
56 |
@@ -1,4 +1,4 @@ |
57 |
-# Copyright 1999-2021 Gentoo Authors |
58 |
+# Copyright 1999-2022 Gentoo Authors |
59 |
# Distributed under the terms of the GNU General Public License v2 |
60 |
|
61 |
# See `man savedconfig.eclass` for info on how to use USE=savedconfig. |
62 |
@@ -149,7 +149,7 @@ src_configure() { |
63 |
busybox_config_option n FEATURE_SH_STANDALONE |
64 |
fi |
65 |
|
66 |
- # If these are not set and we are using a uclibc/busybox setup |
67 |
+ # If these are not set and we are using a busybox setup |
68 |
# all calls to system() will fail. |
69 |
busybox_config_option y ASH |
70 |
busybox_config_option y SH_IS_ASH |
71 |
@@ -173,12 +173,6 @@ src_configure() { |
72 |
busybox_config_option systemd FEATURE_SYSTEMD |
73 |
busybox_config_option math FEATURE_AWK_LIBM |
74 |
|
75 |
- # disable features that uClibc doesn't (yet?) provide. |
76 |
- if use elibc_uclibc; then |
77 |
- busybox_config_option n FEATURE_SYNC_FANCY #567598 |
78 |
- busybox_config_option n NSENTER |
79 |
- fi |
80 |
- |
81 |
# all the debug options are compiler related, so punt them |
82 |
busybox_config_option n DEBUG_SANITIZE |
83 |
busybox_config_option n DEBUG |
84 |
|
85 |
diff --git a/sys-apps/busybox/busybox-1.33.1.ebuild b/sys-apps/busybox/busybox-1.33.1.ebuild |
86 |
index e9062e18e44c..1ba499654370 100644 |
87 |
--- a/sys-apps/busybox/busybox-1.33.1.ebuild |
88 |
+++ b/sys-apps/busybox/busybox-1.33.1.ebuild |
89 |
@@ -1,4 +1,4 @@ |
90 |
-# Copyright 1999-2021 Gentoo Authors |
91 |
+# Copyright 1999-2022 Gentoo Authors |
92 |
# Distributed under the terms of the GNU General Public License v2 |
93 |
|
94 |
# See `man savedconfig.eclass` for info on how to use USE=savedconfig. |
95 |
@@ -141,7 +141,7 @@ src_configure() { |
96 |
busybox_config_option n FEATURE_VI_REGEX_SEARCH |
97 |
fi |
98 |
|
99 |
- # If these are not set and we are using a uclibc/busybox setup |
100 |
+ # If these are not set and we are using a busybox setup |
101 |
# all calls to system() will fail. |
102 |
busybox_config_option y ASH |
103 |
busybox_config_option y SH_IS_ASH |
104 |
@@ -165,12 +165,6 @@ src_configure() { |
105 |
busybox_config_option systemd FEATURE_SYSTEMD |
106 |
busybox_config_option math FEATURE_AWK_LIBM |
107 |
|
108 |
- # disable features that uClibc doesn't (yet?) provide. |
109 |
- if use elibc_uclibc; then |
110 |
- busybox_config_option n FEATURE_SYNC_FANCY #567598 |
111 |
- busybox_config_option n NSENTER |
112 |
- fi |
113 |
- |
114 |
# all the debug options are compiler related, so punt them |
115 |
busybox_config_option n DEBUG_SANITIZE |
116 |
busybox_config_option n DEBUG |
117 |
|
118 |
diff --git a/sys-apps/busybox/busybox-1.34.1.ebuild b/sys-apps/busybox/busybox-1.34.1.ebuild |
119 |
index b1a831ef90de..693ba522154c 100644 |
120 |
--- a/sys-apps/busybox/busybox-1.34.1.ebuild |
121 |
+++ b/sys-apps/busybox/busybox-1.34.1.ebuild |
122 |
@@ -1,4 +1,4 @@ |
123 |
-# Copyright 1999-2021 Gentoo Authors |
124 |
+# Copyright 1999-2022 Gentoo Authors |
125 |
# Distributed under the terms of the GNU General Public License v2 |
126 |
|
127 |
# See `man savedconfig.eclass` for info on how to use USE=savedconfig. |
128 |
@@ -149,7 +149,7 @@ src_configure() { |
129 |
busybox_config_option n FEATURE_SH_STANDALONE |
130 |
fi |
131 |
|
132 |
- # If these are not set and we are using a uclibc/busybox setup |
133 |
+ # If these are not set and we are using a busybox setup |
134 |
# all calls to system() will fail. |
135 |
busybox_config_option y ASH |
136 |
busybox_config_option y SH_IS_ASH |
137 |
@@ -173,12 +173,6 @@ src_configure() { |
138 |
busybox_config_option systemd FEATURE_SYSTEMD |
139 |
busybox_config_option math FEATURE_AWK_LIBM |
140 |
|
141 |
- # disable features that uClibc doesn't (yet?) provide. |
142 |
- if use elibc_uclibc; then |
143 |
- busybox_config_option n FEATURE_SYNC_FANCY #567598 |
144 |
- busybox_config_option n NSENTER |
145 |
- fi |
146 |
- |
147 |
# all the debug options are compiler related, so punt them |
148 |
busybox_config_option n DEBUG_SANITIZE |
149 |
busybox_config_option n DEBUG |
150 |
|
151 |
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild |
152 |
index 4a2e50fc5d8a..9cca9167e60a 100644 |
153 |
--- a/sys-apps/busybox/busybox-9999.ebuild |
154 |
+++ b/sys-apps/busybox/busybox-9999.ebuild |
155 |
@@ -1,4 +1,4 @@ |
156 |
-# Copyright 1999-2021 Gentoo Authors |
157 |
+# Copyright 1999-2022 Gentoo Authors |
158 |
# Distributed under the terms of the GNU General Public License v2 |
159 |
|
160 |
# See `man savedconfig.eclass` for info on how to use USE=savedconfig. |
161 |
@@ -149,7 +149,7 @@ src_configure() { |
162 |
busybox_config_option n FEATURE_SH_STANDALONE |
163 |
fi |
164 |
|
165 |
- # If these are not set and we are using a uclibc/busybox setup |
166 |
+ # If these are not set and we are using a busybox setup |
167 |
# all calls to system() will fail. |
168 |
busybox_config_option y ASH |
169 |
busybox_config_option y SH_IS_ASH |
170 |
@@ -173,12 +173,6 @@ src_configure() { |
171 |
busybox_config_option systemd FEATURE_SYSTEMD |
172 |
busybox_config_option math FEATURE_AWK_LIBM |
173 |
|
174 |
- # disable features that uClibc doesn't (yet?) provide. |
175 |
- if use elibc_uclibc; then |
176 |
- busybox_config_option n FEATURE_SYNC_FANCY #567598 |
177 |
- busybox_config_option n NSENTER |
178 |
- fi |
179 |
- |
180 |
# all the debug options are compiler related, so punt them |
181 |
busybox_config_option n DEBUG_SANITIZE |
182 |
busybox_config_option n DEBUG |