1 |
commit: 741e832ee8c92ab6efc2827167a7ce18c66e9154 |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 14 14:49:20 2016 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 14 14:49:20 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/grs.git/commit/?id=741e832e |
7 |
|
8 |
Switch to uclibc-ng stages |
9 |
|
10 |
.../package.accept_keywords/sys-libs_uclibc_0 | 1 - |
11 |
core/etc/portage/package.use/sys-libs_uclibc_0 | 1 - |
12 |
...ldso-libdl-libdl.c-do-not-unmap-libraries.patch | 25 -- |
13 |
.../sys-libs/uclibc/99-libc-add-isfdtype.patch | 65 ------ |
14 |
core/etc/portage/savedconfig/sys-libs/uclibc-9999 | 260 --------------------- |
15 |
scripts/cycle.1.sh | 8 +- |
16 |
6 files changed, 1 insertion(+), 359 deletions(-) |
17 |
|
18 |
diff --git a/core/etc/portage/package.accept_keywords/sys-libs_uclibc_0 b/core/etc/portage/package.accept_keywords/sys-libs_uclibc_0 |
19 |
deleted file mode 100644 |
20 |
index 4425c84..0000000 |
21 |
--- a/core/etc/portage/package.accept_keywords/sys-libs_uclibc_0 |
22 |
+++ /dev/null |
23 |
@@ -1 +0,0 @@ |
24 |
-=sys-libs/uclibc-0.9.33.9999 ** |
25 |
|
26 |
diff --git a/core/etc/portage/package.use/sys-libs_uclibc_0 b/core/etc/portage/package.use/sys-libs_uclibc_0 |
27 |
deleted file mode 100644 |
28 |
index 0715d0b..0000000 |
29 |
--- a/core/etc/portage/package.use/sys-libs_uclibc_0 |
30 |
+++ /dev/null |
31 |
@@ -1 +0,0 @@ |
32 |
-sys-libs/uclibc -* savedconfig |
33 |
|
34 |
diff --git a/core/etc/portage/patches/sys-libs/uclibc/98-ldso-libdl-libdl.c-do-not-unmap-libraries.patch b/core/etc/portage/patches/sys-libs/uclibc/98-ldso-libdl-libdl.c-do-not-unmap-libraries.patch |
35 |
deleted file mode 100644 |
36 |
index 5f68c99..0000000 |
37 |
--- a/core/etc/portage/patches/sys-libs/uclibc/98-ldso-libdl-libdl.c-do-not-unmap-libraries.patch |
38 |
+++ /dev/null |
39 |
@@ -1,25 +0,0 @@ |
40 |
-From 579dcdbc8aab966b22f6324a16dbf8fd08a607c3 Mon Sep 17 00:00:00 2001 |
41 |
-From: "Anthony G. Basile" <blueness@g.o> |
42 |
-Date: Fri, 17 Apr 2015 16:51:43 -0400 |
43 |
-Subject: [PATCH] ldso/libdl/libdl.c: do not unmap libraries. |
44 |
- |
45 |
---- |
46 |
- ldso/libdl/libdl.c | 2 +- |
47 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
48 |
- |
49 |
-diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c |
50 |
-index 49711a8..2c43c07 100644 |
51 |
---- a/ldso/libdl/libdl.c |
52 |
-+++ b/ldso/libdl/libdl.c |
53 |
-@@ -977,7 +977,7 @@ static int do_dlclose(void *vhandle, int need_fini) |
54 |
- |
55 |
- end = (end + ADDR_ALIGN) & PAGE_ALIGN; |
56 |
- start = start & ~ADDR_ALIGN; |
57 |
-- DL_LIB_UNMAP (tpnt, end - start); |
58 |
-+ //DL_LIB_UNMAP (tpnt, end - start); |
59 |
- /* Free elements in RTLD_LOCAL scope list */ |
60 |
- for (runp = tpnt->rtld_local; runp; runp = tmp) { |
61 |
- tmp = runp->next; |
62 |
--- |
63 |
-2.0.5 |
64 |
- |
65 |
|
66 |
diff --git a/core/etc/portage/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch b/core/etc/portage/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch |
67 |
deleted file mode 100644 |
68 |
index 007ec33..0000000 |
69 |
--- a/core/etc/portage/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch |
70 |
+++ /dev/null |
71 |
@@ -1,65 +0,0 @@ |
72 |
-From f22cca4722fa66e424562e69f4afa2bca0af871d Mon Sep 17 00:00:00 2001 |
73 |
-From: "Anthony G. Basile" <blueness@g.o> |
74 |
-Date: Sun, 28 Jul 2013 09:08:34 -0400 |
75 |
-Subject: [PATCH] libc: add isfdtype() |
76 |
- |
77 |
-isfdtype(int fd, int fdtype) check whether a file descriptor fd is |
78 |
-of type fdtype, where the types are defined in stat(2). It is |
79 |
-supported in glibc and BSD, and used by utilities such as acpid. |
80 |
- |
81 |
-Signed-off-by: Anthony G. Basile <blueness@g.o> |
82 |
-Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@×××××.com> |
83 |
---- |
84 |
- libc/misc/file/isfdtype.c | 40 ++++++++++++++++++++++++++++++++++++++++ |
85 |
- 1 file changed, 40 insertions(+) |
86 |
- create mode 100644 libc/misc/file/isfdtype.c |
87 |
- |
88 |
-diff --git a/libc/misc/file/isfdtype.c b/libc/misc/file/isfdtype.c |
89 |
-new file mode 100644 |
90 |
-index 0000000..4d9199b |
91 |
---- /dev/null |
92 |
-+++ libc/misc/file/isfdtype.c |
93 |
-@@ -0,0 +1,40 @@ |
94 |
-+/* Determine whether descriptor has given property. |
95 |
-+ Copyright (C) 1996-2013 Free Software Foundation, Inc. |
96 |
-+ This file is part of the GNU C Library. |
97 |
-+ |
98 |
-+ The GNU C Library is free software; you can redistribute it and/or |
99 |
-+ modify it under the terms of the GNU Lesser General Public |
100 |
-+ License as published by the Free Software Foundation; either |
101 |
-+ version 2.1 of the License, or (at your option) any later version. |
102 |
-+ |
103 |
-+ The GNU C Library is distributed in the hope that it will be useful, |
104 |
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of |
105 |
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
106 |
-+ Lesser General Public License for more details. |
107 |
-+ |
108 |
-+ You should have received a copy of the GNU Lesser General Public |
109 |
-+ License along with the GNU C Library; if not, see |
110 |
-+ <http://www.gnu.org/licenses/>. */ |
111 |
-+ |
112 |
-+#include <errno.h> |
113 |
-+#include <sys/stat.h> |
114 |
-+#include <sys/socket.h> |
115 |
-+#include <sys/types.h> |
116 |
-+#ifdef __UCLIBC_HAS_LFS__ |
117 |
-+# include <_lfs_64.h> |
118 |
-+#else |
119 |
-+# define stat64 stat |
120 |
-+# define fstat64 fstat |
121 |
-+#endif |
122 |
-+ |
123 |
-+int |
124 |
-+isfdtype (int fildes, int fdtype) |
125 |
-+{ |
126 |
-+ struct stat64 st; |
127 |
-+ int save_error = errno; |
128 |
-+ int result = fstat64 (fildes, &st); |
129 |
-+ __set_errno (save_error); |
130 |
-+ if (result) |
131 |
-+ return result; |
132 |
-+ return (st.st_mode & S_IFMT) == (mode_t) fdtype; |
133 |
-+} |
134 |
--- |
135 |
-1.8.3.2.733.gf8abaeb |
136 |
- |
137 |
|
138 |
diff --git a/core/etc/portage/savedconfig/sys-libs/uclibc-9999 b/core/etc/portage/savedconfig/sys-libs/uclibc-9999 |
139 |
deleted file mode 100644 |
140 |
index 5023930..0000000 |
141 |
--- a/core/etc/portage/savedconfig/sys-libs/uclibc-9999 |
142 |
+++ /dev/null |
143 |
@@ -1,260 +0,0 @@ |
144 |
-# |
145 |
-# Automatically generated file; DO NOT EDIT. |
146 |
-# uClibc 0.9.34-git C Library Configuration |
147 |
-# |
148 |
-# TARGET_alpha is not set |
149 |
-# TARGET_arc is not set |
150 |
-# TARGET_arm is not set |
151 |
-# TARGET_avr32 is not set |
152 |
-# TARGET_bfin is not set |
153 |
-# TARGET_c6x is not set |
154 |
-# TARGET_cris is not set |
155 |
-# TARGET_e1 is not set |
156 |
-# TARGET_frv is not set |
157 |
-# TARGET_h8300 is not set |
158 |
-# TARGET_hppa is not set |
159 |
-# TARGET_i386 is not set |
160 |
-# TARGET_i960 is not set |
161 |
-# TARGET_ia64 is not set |
162 |
-# TARGET_m68k is not set |
163 |
-# TARGET_metag is not set |
164 |
-# TARGET_microblaze is not set |
165 |
-# TARGET_mips is not set |
166 |
-# TARGET_nios is not set |
167 |
-# TARGET_nios2 is not set |
168 |
-# TARGET_powerpc is not set |
169 |
-# TARGET_sh is not set |
170 |
-# TARGET_sh64 is not set |
171 |
-# TARGET_sparc is not set |
172 |
-# TARGET_v850 is not set |
173 |
-# TARGET_vax is not set |
174 |
-TARGET_x86_64=y |
175 |
-# TARGET_xtensa is not set |
176 |
- |
177 |
-# |
178 |
-# Target Architecture Features and Options |
179 |
-# |
180 |
-TARGET_ARCH="x86_64" |
181 |
-FORCE_OPTIONS_FOR_ARCH=y |
182 |
-TARGET_SUBARCH="" |
183 |
- |
184 |
-# |
185 |
-# Using ELF file format |
186 |
-# |
187 |
-ARCH_HAS_DEPRECATED_SYSCALLS=y |
188 |
-ARCH_LITTLE_ENDIAN=y |
189 |
- |
190 |
-# |
191 |
-# Using Little Endian |
192 |
-# |
193 |
-ARCH_HAS_MMU=y |
194 |
-ARCH_USE_MMU=y |
195 |
-UCLIBC_HAS_FLOATS=y |
196 |
-UCLIBC_HAS_FPU=y |
197 |
-DO_C99_MATH=y |
198 |
-DO_XSI_MATH=y |
199 |
-UCLIBC_HAS_FENV=y |
200 |
-UCLIBC_HAS_LONG_DOUBLE_MATH=y |
201 |
-KERNEL_HEADERS="/usr/include" |
202 |
-HAVE_DOT_CONFIG=y |
203 |
- |
204 |
-# |
205 |
-# General Library Settings |
206 |
-# |
207 |
-DOPIC=y |
208 |
-ARCH_HAS_UCONTEXT=y |
209 |
-HAVE_SHARED=y |
210 |
-FORCE_SHAREABLE_TEXT_SEGMENTS=y |
211 |
-LDSO_LDD_SUPPORT=y |
212 |
-LDSO_CACHE_SUPPORT=y |
213 |
-LDSO_PRELOAD_ENV_SUPPORT=y |
214 |
-LDSO_PRELOAD_FILE_SUPPORT=y |
215 |
-LDSO_BASE_FILENAME="ld.so" |
216 |
-LDSO_STANDALONE_SUPPORT=y |
217 |
-LDSO_PRELINK_SUPPORT=y |
218 |
-UCLIBC_STATIC_LDCONFIG=y |
219 |
-LDSO_RUNPATH=y |
220 |
-LDSO_RUNPATH_OF_EXECUTABLE=y |
221 |
-LDSO_SAFE_RUNPATH=y |
222 |
-LDSO_SEARCH_INTERP_PATH=y |
223 |
-LDSO_LD_LIBRARY_PATH=y |
224 |
-# LDSO_NO_CLEANUP is not set |
225 |
-UCLIBC_CTOR_DTOR=y |
226 |
-LDSO_GNU_HASH_SUPPORT=y |
227 |
-# HAS_NO_THREADS is not set |
228 |
-# LINUXTHREADS_OLD is not set |
229 |
-# LINUXTHREADS_NEW is not set |
230 |
-UCLIBC_HAS_THREADS_NATIVE=y |
231 |
-UCLIBC_HAS_THREADS=y |
232 |
-UCLIBC_HAS_TLS=y |
233 |
-PTHREADS_DEBUG_SUPPORT=y |
234 |
-UCLIBC_HAS_SYSLOG=y |
235 |
-UCLIBC_HAS_LFS=y |
236 |
-# MALLOC is not set |
237 |
-# MALLOC_SIMPLE is not set |
238 |
-MALLOC_STANDARD=y |
239 |
-MALLOC_GLIBC_COMPAT=y |
240 |
-UCLIBC_HAS_OBSTACK=y |
241 |
-UCLIBC_DYNAMIC_ATEXIT=y |
242 |
-COMPAT_ATEXIT=y |
243 |
-UCLIBC_HAS_UTMPX=y |
244 |
-# UCLIBC_HAS_UTMP is not set |
245 |
-# UCLIBC_SUSV2_LEGACY is not set |
246 |
-UCLIBC_SUSV3_LEGACY=y |
247 |
-# UCLIBC_HAS_CONTEXT_FUNCS is not set |
248 |
-UCLIBC_SUSV3_LEGACY_MACROS=y |
249 |
-UCLIBC_SUSV4_LEGACY=y |
250 |
-# UCLIBC_STRICT_HEADERS is not set |
251 |
-UCLIBC_HAS_STUBS=y |
252 |
-UCLIBC_HAS_SHADOW=y |
253 |
-UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y |
254 |
-UCLIBC_HAS___PROGNAME=y |
255 |
-UCLIBC_HAS_PTY=y |
256 |
-ASSUME_DEVPTS=y |
257 |
-UNIX98PTY_ONLY=y |
258 |
-UCLIBC_HAS_GETPT=y |
259 |
-UCLIBC_HAS_LIBUTIL=y |
260 |
-UCLIBC_HAS_TM_EXTENSIONS=y |
261 |
-UCLIBC_HAS_TZ_CACHING=y |
262 |
-UCLIBC_HAS_TZ_FILE=y |
263 |
-UCLIBC_HAS_TZ_FILE_READ_MANY=y |
264 |
-UCLIBC_TZ_FILE_PATH="/etc/TZ" |
265 |
-UCLIBC_FALLBACK_TO_ETC_LOCALTIME=y |
266 |
- |
267 |
-# |
268 |
-# Advanced Library Settings |
269 |
-# |
270 |
-UCLIBC_PWD_BUFFER_SIZE=256 |
271 |
-UCLIBC_GRP_BUFFER_SIZE=256 |
272 |
- |
273 |
-# |
274 |
-# Support various families of functions |
275 |
-# |
276 |
-UCLIBC_LINUX_MODULE_26=y |
277 |
-# UCLIBC_LINUX_MODULE_24 is not set |
278 |
-UCLIBC_LINUX_SPECIFIC=y |
279 |
-UCLIBC_HAS_GNU_ERROR=y |
280 |
-UCLIBC_BSD_SPECIFIC=y |
281 |
-UCLIBC_HAS_BSD_ERR=y |
282 |
-# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set |
283 |
-# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set |
284 |
-UCLIBC_NTP_LEGACY=y |
285 |
-# UCLIBC_SV4_DEPRECATED is not set |
286 |
-UCLIBC_HAS_REALTIME=y |
287 |
-UCLIBC_HAS_ADVANCED_REALTIME=y |
288 |
-UCLIBC_HAS_EPOLL=y |
289 |
-UCLIBC_HAS_XATTR=y |
290 |
-# UCLIBC_HAS_PROFILING is not set |
291 |
-UCLIBC_HAS_CRYPT_IMPL=y |
292 |
-UCLIBC_HAS_SHA256_CRYPT_IMPL=y |
293 |
-UCLIBC_HAS_SHA512_CRYPT_IMPL=y |
294 |
-UCLIBC_HAS_CRYPT=y |
295 |
-UCLIBC_HAS_NETWORK_SUPPORT=y |
296 |
-UCLIBC_HAS_SOCKET=y |
297 |
-UCLIBC_HAS_IPV4=y |
298 |
-UCLIBC_HAS_IPV6=y |
299 |
-UCLIBC_HAS_RPC=y |
300 |
-UCLIBC_HAS_FULL_RPC=y |
301 |
-UCLIBC_HAS_REENTRANT_RPC=y |
302 |
-UCLIBC_USE_NETLINK=y |
303 |
-UCLIBC_SUPPORT_AI_ADDRCONFIG=y |
304 |
-UCLIBC_HAS_BSD_RES_CLOSE=y |
305 |
-UCLIBC_HAS_COMPAT_RES_STATE=y |
306 |
-UCLIBC_HAS_EXTRA_COMPAT_RES_STATE=y |
307 |
-UCLIBC_HAS_RESOLVER_SUPPORT=y |
308 |
-UCLIBC_HAS_LIBRESOLV_STUB=y |
309 |
-UCLIBC_HAS_LIBNSL_STUB=y |
310 |
- |
311 |
-# |
312 |
-# String and Stdio Support |
313 |
-# |
314 |
-UCLIBC_HAS_STRING_GENERIC_OPT=y |
315 |
-UCLIBC_HAS_STRING_ARCH_OPT=y |
316 |
-UCLIBC_HAS_STDIO_FUTEXES=y |
317 |
-UCLIBC_HAS_CTYPE_TABLES=y |
318 |
-UCLIBC_HAS_CTYPE_SIGNED=y |
319 |
-# UCLIBC_HAS_CTYPE_UNSAFE is not set |
320 |
-UCLIBC_HAS_CTYPE_CHECKED=y |
321 |
-# UCLIBC_HAS_CTYPE_ENFORCED is not set |
322 |
-UCLIBC_HAS_WCHAR=y |
323 |
-# UCLIBC_HAS_LOCALE is not set |
324 |
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y |
325 |
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y |
326 |
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 |
327 |
-# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set |
328 |
-# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set |
329 |
-# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set |
330 |
-# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set |
331 |
-UCLIBC_HAS_STDIO_BUFSIZ_4096=y |
332 |
-# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set |
333 |
-UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y |
334 |
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set |
335 |
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set |
336 |
-# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set |
337 |
-UCLIBC_HAS_STDIO_GETC_MACRO=y |
338 |
-UCLIBC_HAS_STDIO_PUTC_MACRO=y |
339 |
-UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y |
340 |
-UCLIBC_HAS_FOPEN_LARGEFILE_MODE=y |
341 |
-UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y |
342 |
-UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE=y |
343 |
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y |
344 |
-UCLIBC_HAS_PRINTF_M_SPEC=y |
345 |
-UCLIBC_HAS_ERRNO_MESSAGES=y |
346 |
-UCLIBC_HAS_SYS_ERRLIST=y |
347 |
-UCLIBC_HAS_SIGNUM_MESSAGES=y |
348 |
-UCLIBC_HAS_SYS_SIGLIST=y |
349 |
-UCLIBC_HAS_GNU_GETOPT=y |
350 |
-UCLIBC_HAS_GETOPT_LONG=y |
351 |
-UCLIBC_HAS_GNU_GETSUBOPT=y |
352 |
- |
353 |
-# |
354 |
-# Big and Tall |
355 |
-# |
356 |
-UCLIBC_HAS_REGEX=y |
357 |
-UCLIBC_HAS_REGEX_OLD=y |
358 |
-UCLIBC_HAS_FNMATCH=y |
359 |
-UCLIBC_HAS_FNMATCH_OLD=y |
360 |
-UCLIBC_HAS_WORDEXP=y |
361 |
-UCLIBC_HAS_NFTW=y |
362 |
-UCLIBC_HAS_FTW=y |
363 |
-UCLIBC_HAS_FTS=y |
364 |
-UCLIBC_HAS_GLOB=y |
365 |
-UCLIBC_HAS_GNU_GLOB=y |
366 |
- |
367 |
-# |
368 |
-# Library Installation Options |
369 |
-# |
370 |
-RUNTIME_PREFIX="/" |
371 |
-DEVEL_PREFIX="/usr" |
372 |
-MULTILIB_DIR="lib" |
373 |
-HARDWIRED_ABSPATH=y |
374 |
- |
375 |
-# |
376 |
-# Security options |
377 |
-# |
378 |
-UCLIBC_HAS_ARC4RANDOM=y |
379 |
-# ARC4RANDOM_USES_NODEV is not set |
380 |
-UCLIBC_HAS_SSP=y |
381 |
-# UCLIBC_HAS_SSP_COMPAT is not set |
382 |
-# SSP_QUICK_CANARY is not set |
383 |
-UCLIBC_BUILD_SSP=y |
384 |
-UCLIBC_BUILD_RELRO=y |
385 |
-UCLIBC_BUILD_NOW=y |
386 |
-UCLIBC_BUILD_NOEXECSTACK=y |
387 |
- |
388 |
-# |
389 |
-# Development/debugging options |
390 |
-# |
391 |
-CROSS_COMPILER_PREFIX="" |
392 |
-UCLIBC_EXTRA_CFLAGS="" |
393 |
-# DODEBUG is not set |
394 |
-DOSTRIP=y |
395 |
-# DOASSERTS is not set |
396 |
-# SUPPORT_LD_DEBUG is not set |
397 |
-# SUPPORT_LD_DEBUG_EARLY is not set |
398 |
-# UCLIBC_MALLOC_DEBUGGING is not set |
399 |
-UCLIBC_HAS_BACKTRACE=y |
400 |
-WARNINGS="-Wall" |
401 |
-# EXTRA_WARNINGS is not set |
402 |
-# DOMULTI is not set |
403 |
-# UCLIBC_MJN3_ONLY is not set |
404 |
|
405 |
diff --git a/scripts/cycle.1.sh b/scripts/cycle.1.sh |
406 |
index ee6dff5..23944db 100644 |
407 |
--- a/scripts/cycle.1.sh |
408 |
+++ b/scripts/cycle.1.sh |
409 |
@@ -3,13 +3,7 @@ |
410 |
source /etc/profile |
411 |
env-update |
412 |
|
413 |
-# This comes from the stage3, but we might |
414 |
-# be building a different version of uclibc. |
415 |
-rm -f /etc/portage/package.use/uclibc |
416 |
-rm -f /etc/portage/savedconfig/sys-libs/uclibc |
417 |
-emerge -b1q uclibc |
418 |
- |
419 |
emerge -b1q binutils |
420 |
emerge -b1q gcc |
421 |
-emerge -b1q uclibc |
422 |
+emerge -b1q uclibc-ng |
423 |
emerge -b1q argp-standalone |