commit: 741e832ee8c92ab6efc2827167a7ce18c66e9154 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Thu Jul 14 14:49:20 2016 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Thu Jul 14 14:49:20 2016 +0000 URL: https://gitweb.gentoo.org/proj/grs.git/commit/?id=741e832e
Switch to uclibc-ng stages .../package.accept_keywords/sys-libs_uclibc_0 | 1 - core/etc/portage/package.use/sys-libs_uclibc_0 | 1 - ...ldso-libdl-libdl.c-do-not-unmap-libraries.patch | 25 -- .../sys-libs/uclibc/99-libc-add-isfdtype.patch | 65 ------ core/etc/portage/savedconfig/sys-libs/uclibc-9999 | 260 --------------------- scripts/cycle.1.sh | 8 +- 6 files changed, 1 insertion(+), 359 deletions(-) diff --git a/core/etc/portage/package.accept_keywords/sys-libs_uclibc_0 b/core/etc/portage/package.accept_keywords/sys-libs_uclibc_0 deleted file mode 100644 index 4425c84..0000000 --- a/core/etc/portage/package.accept_keywords/sys-libs_uclibc_0 +++ /dev/null @@ -1 +0,0 @@ -=sys-libs/uclibc-0.9.33.9999 ** diff --git a/core/etc/portage/package.use/sys-libs_uclibc_0 b/core/etc/portage/package.use/sys-libs_uclibc_0 deleted file mode 100644 index 0715d0b..0000000 --- a/core/etc/portage/package.use/sys-libs_uclibc_0 +++ /dev/null @@ -1 +0,0 @@ -sys-libs/uclibc -* savedconfig 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 deleted file mode 100644 index 5f68c99..0000000 --- a/core/etc/portage/patches/sys-libs/uclibc/98-ldso-libdl-libdl.c-do-not-unmap-libraries.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 579dcdbc8aab966b22f6324a16dbf8fd08a607c3 Mon Sep 17 00:00:00 2001 -From: "Anthony G. Basile" <[email protected]> -Date: Fri, 17 Apr 2015 16:51:43 -0400 -Subject: [PATCH] ldso/libdl/libdl.c: do not unmap libraries. - ---- - ldso/libdl/libdl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c -index 49711a8..2c43c07 100644 ---- a/ldso/libdl/libdl.c -+++ b/ldso/libdl/libdl.c -@@ -977,7 +977,7 @@ static int do_dlclose(void *vhandle, int need_fini) - - end = (end + ADDR_ALIGN) & PAGE_ALIGN; - start = start & ~ADDR_ALIGN; -- DL_LIB_UNMAP (tpnt, end - start); -+ //DL_LIB_UNMAP (tpnt, end - start); - /* Free elements in RTLD_LOCAL scope list */ - for (runp = tpnt->rtld_local; runp; runp = tmp) { - tmp = runp->next; --- -2.0.5 - 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 deleted file mode 100644 index 007ec33..0000000 --- a/core/etc/portage/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch +++ /dev/null @@ -1,65 +0,0 @@ -From f22cca4722fa66e424562e69f4afa2bca0af871d Mon Sep 17 00:00:00 2001 -From: "Anthony G. Basile" <[email protected]> -Date: Sun, 28 Jul 2013 09:08:34 -0400 -Subject: [PATCH] libc: add isfdtype() - -isfdtype(int fd, int fdtype) check whether a file descriptor fd is -of type fdtype, where the types are defined in stat(2). It is -supported in glibc and BSD, and used by utilities such as acpid. - -Signed-off-by: Anthony G. Basile <[email protected]> -Signed-off-by: Bernhard Reutner-Fischer <[email protected]> ---- - libc/misc/file/isfdtype.c | 40 ++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 40 insertions(+) - create mode 100644 libc/misc/file/isfdtype.c - -diff --git a/libc/misc/file/isfdtype.c b/libc/misc/file/isfdtype.c -new file mode 100644 -index 0000000..4d9199b ---- /dev/null -+++ libc/misc/file/isfdtype.c -@@ -0,0 +1,40 @@ -+/* Determine whether descriptor has given property. -+ Copyright (C) 1996-2013 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <http://www.gnu.org/licenses/>. */ -+ -+#include <errno.h> -+#include <sys/stat.h> -+#include <sys/socket.h> -+#include <sys/types.h> -+#ifdef __UCLIBC_HAS_LFS__ -+# include <_lfs_64.h> -+#else -+# define stat64 stat -+# define fstat64 fstat -+#endif -+ -+int -+isfdtype (int fildes, int fdtype) -+{ -+ struct stat64 st; -+ int save_error = errno; -+ int result = fstat64 (fildes, &st); -+ __set_errno (save_error); -+ if (result) -+ return result; -+ return (st.st_mode & S_IFMT) == (mode_t) fdtype; -+} --- -1.8.3.2.733.gf8abaeb - diff --git a/core/etc/portage/savedconfig/sys-libs/uclibc-9999 b/core/etc/portage/savedconfig/sys-libs/uclibc-9999 deleted file mode 100644 index 5023930..0000000 --- a/core/etc/portage/savedconfig/sys-libs/uclibc-9999 +++ /dev/null @@ -1,260 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# uClibc 0.9.34-git C Library Configuration -# -# TARGET_alpha is not set -# TARGET_arc is not set -# TARGET_arm is not set -# TARGET_avr32 is not set -# TARGET_bfin is not set -# TARGET_c6x is not set -# TARGET_cris is not set -# TARGET_e1 is not set -# TARGET_frv is not set -# TARGET_h8300 is not set -# TARGET_hppa is not set -# TARGET_i386 is not set -# TARGET_i960 is not set -# TARGET_ia64 is not set -# TARGET_m68k is not set -# TARGET_metag is not set -# TARGET_microblaze is not set -# TARGET_mips is not set -# TARGET_nios is not set -# TARGET_nios2 is not set -# TARGET_powerpc is not set -# TARGET_sh is not set -# TARGET_sh64 is not set -# TARGET_sparc is not set -# TARGET_v850 is not set -# TARGET_vax is not set -TARGET_x86_64=y -# TARGET_xtensa is not set - -# -# Target Architecture Features and Options -# -TARGET_ARCH="x86_64" -FORCE_OPTIONS_FOR_ARCH=y -TARGET_SUBARCH="" - -# -# Using ELF file format -# -ARCH_HAS_DEPRECATED_SYSCALLS=y -ARCH_LITTLE_ENDIAN=y - -# -# Using Little Endian -# -ARCH_HAS_MMU=y -ARCH_USE_MMU=y -UCLIBC_HAS_FLOATS=y -UCLIBC_HAS_FPU=y -DO_C99_MATH=y -DO_XSI_MATH=y -UCLIBC_HAS_FENV=y -UCLIBC_HAS_LONG_DOUBLE_MATH=y -KERNEL_HEADERS="/usr/include" -HAVE_DOT_CONFIG=y - -# -# General Library Settings -# -DOPIC=y -ARCH_HAS_UCONTEXT=y -HAVE_SHARED=y -FORCE_SHAREABLE_TEXT_SEGMENTS=y -LDSO_LDD_SUPPORT=y -LDSO_CACHE_SUPPORT=y -LDSO_PRELOAD_ENV_SUPPORT=y -LDSO_PRELOAD_FILE_SUPPORT=y -LDSO_BASE_FILENAME="ld.so" -LDSO_STANDALONE_SUPPORT=y -LDSO_PRELINK_SUPPORT=y -UCLIBC_STATIC_LDCONFIG=y -LDSO_RUNPATH=y -LDSO_RUNPATH_OF_EXECUTABLE=y -LDSO_SAFE_RUNPATH=y -LDSO_SEARCH_INTERP_PATH=y -LDSO_LD_LIBRARY_PATH=y -# LDSO_NO_CLEANUP is not set -UCLIBC_CTOR_DTOR=y -LDSO_GNU_HASH_SUPPORT=y -# HAS_NO_THREADS is not set -# LINUXTHREADS_OLD is not set -# LINUXTHREADS_NEW is not set -UCLIBC_HAS_THREADS_NATIVE=y -UCLIBC_HAS_THREADS=y -UCLIBC_HAS_TLS=y -PTHREADS_DEBUG_SUPPORT=y -UCLIBC_HAS_SYSLOG=y -UCLIBC_HAS_LFS=y -# MALLOC is not set -# MALLOC_SIMPLE is not set -MALLOC_STANDARD=y -MALLOC_GLIBC_COMPAT=y -UCLIBC_HAS_OBSTACK=y -UCLIBC_DYNAMIC_ATEXIT=y -COMPAT_ATEXIT=y -UCLIBC_HAS_UTMPX=y -# UCLIBC_HAS_UTMP is not set -# UCLIBC_SUSV2_LEGACY is not set -UCLIBC_SUSV3_LEGACY=y -# UCLIBC_HAS_CONTEXT_FUNCS is not set -UCLIBC_SUSV3_LEGACY_MACROS=y -UCLIBC_SUSV4_LEGACY=y -# UCLIBC_STRICT_HEADERS is not set -UCLIBC_HAS_STUBS=y -UCLIBC_HAS_SHADOW=y -UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y -UCLIBC_HAS___PROGNAME=y -UCLIBC_HAS_PTY=y -ASSUME_DEVPTS=y -UNIX98PTY_ONLY=y -UCLIBC_HAS_GETPT=y -UCLIBC_HAS_LIBUTIL=y -UCLIBC_HAS_TM_EXTENSIONS=y -UCLIBC_HAS_TZ_CACHING=y -UCLIBC_HAS_TZ_FILE=y -UCLIBC_HAS_TZ_FILE_READ_MANY=y -UCLIBC_TZ_FILE_PATH="/etc/TZ" -UCLIBC_FALLBACK_TO_ETC_LOCALTIME=y - -# -# Advanced Library Settings -# -UCLIBC_PWD_BUFFER_SIZE=256 -UCLIBC_GRP_BUFFER_SIZE=256 - -# -# Support various families of functions -# -UCLIBC_LINUX_MODULE_26=y -# UCLIBC_LINUX_MODULE_24 is not set -UCLIBC_LINUX_SPECIFIC=y -UCLIBC_HAS_GNU_ERROR=y -UCLIBC_BSD_SPECIFIC=y -UCLIBC_HAS_BSD_ERR=y -# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set -# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set -UCLIBC_NTP_LEGACY=y -# UCLIBC_SV4_DEPRECATED is not set -UCLIBC_HAS_REALTIME=y -UCLIBC_HAS_ADVANCED_REALTIME=y -UCLIBC_HAS_EPOLL=y -UCLIBC_HAS_XATTR=y -# UCLIBC_HAS_PROFILING is not set -UCLIBC_HAS_CRYPT_IMPL=y -UCLIBC_HAS_SHA256_CRYPT_IMPL=y -UCLIBC_HAS_SHA512_CRYPT_IMPL=y -UCLIBC_HAS_CRYPT=y -UCLIBC_HAS_NETWORK_SUPPORT=y -UCLIBC_HAS_SOCKET=y -UCLIBC_HAS_IPV4=y -UCLIBC_HAS_IPV6=y -UCLIBC_HAS_RPC=y -UCLIBC_HAS_FULL_RPC=y -UCLIBC_HAS_REENTRANT_RPC=y -UCLIBC_USE_NETLINK=y -UCLIBC_SUPPORT_AI_ADDRCONFIG=y -UCLIBC_HAS_BSD_RES_CLOSE=y -UCLIBC_HAS_COMPAT_RES_STATE=y -UCLIBC_HAS_EXTRA_COMPAT_RES_STATE=y -UCLIBC_HAS_RESOLVER_SUPPORT=y -UCLIBC_HAS_LIBRESOLV_STUB=y -UCLIBC_HAS_LIBNSL_STUB=y - -# -# String and Stdio Support -# -UCLIBC_HAS_STRING_GENERIC_OPT=y -UCLIBC_HAS_STRING_ARCH_OPT=y -UCLIBC_HAS_STDIO_FUTEXES=y -UCLIBC_HAS_CTYPE_TABLES=y -UCLIBC_HAS_CTYPE_SIGNED=y -# UCLIBC_HAS_CTYPE_UNSAFE is not set -UCLIBC_HAS_CTYPE_CHECKED=y -# UCLIBC_HAS_CTYPE_ENFORCED is not set -UCLIBC_HAS_WCHAR=y -# UCLIBC_HAS_LOCALE is not set -UCLIBC_HAS_HEXADECIMAL_FLOATS=y -UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y -UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 -# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set -UCLIBC_HAS_STDIO_BUFSIZ_4096=y -# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set -UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y -# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set -# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set -# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set -UCLIBC_HAS_STDIO_GETC_MACRO=y -UCLIBC_HAS_STDIO_PUTC_MACRO=y -UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y -UCLIBC_HAS_FOPEN_LARGEFILE_MODE=y -UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y -UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE=y -UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y -UCLIBC_HAS_PRINTF_M_SPEC=y -UCLIBC_HAS_ERRNO_MESSAGES=y -UCLIBC_HAS_SYS_ERRLIST=y -UCLIBC_HAS_SIGNUM_MESSAGES=y -UCLIBC_HAS_SYS_SIGLIST=y -UCLIBC_HAS_GNU_GETOPT=y -UCLIBC_HAS_GETOPT_LONG=y -UCLIBC_HAS_GNU_GETSUBOPT=y - -# -# Big and Tall -# -UCLIBC_HAS_REGEX=y -UCLIBC_HAS_REGEX_OLD=y -UCLIBC_HAS_FNMATCH=y -UCLIBC_HAS_FNMATCH_OLD=y -UCLIBC_HAS_WORDEXP=y -UCLIBC_HAS_NFTW=y -UCLIBC_HAS_FTW=y -UCLIBC_HAS_FTS=y -UCLIBC_HAS_GLOB=y -UCLIBC_HAS_GNU_GLOB=y - -# -# Library Installation Options -# -RUNTIME_PREFIX="/" -DEVEL_PREFIX="/usr" -MULTILIB_DIR="lib" -HARDWIRED_ABSPATH=y - -# -# Security options -# -UCLIBC_HAS_ARC4RANDOM=y -# ARC4RANDOM_USES_NODEV is not set -UCLIBC_HAS_SSP=y -# UCLIBC_HAS_SSP_COMPAT is not set -# SSP_QUICK_CANARY is not set -UCLIBC_BUILD_SSP=y -UCLIBC_BUILD_RELRO=y -UCLIBC_BUILD_NOW=y -UCLIBC_BUILD_NOEXECSTACK=y - -# -# Development/debugging options -# -CROSS_COMPILER_PREFIX="" -UCLIBC_EXTRA_CFLAGS="" -# DODEBUG is not set -DOSTRIP=y -# DOASSERTS is not set -# SUPPORT_LD_DEBUG is not set -# SUPPORT_LD_DEBUG_EARLY is not set -# UCLIBC_MALLOC_DEBUGGING is not set -UCLIBC_HAS_BACKTRACE=y -WARNINGS="-Wall" -# EXTRA_WARNINGS is not set -# DOMULTI is not set -# UCLIBC_MJN3_ONLY is not set diff --git a/scripts/cycle.1.sh b/scripts/cycle.1.sh index ee6dff5..23944db 100644 --- a/scripts/cycle.1.sh +++ b/scripts/cycle.1.sh @@ -3,13 +3,7 @@ source /etc/profile env-update -# This comes from the stage3, but we might -# be building a different version of uclibc. -rm -f /etc/portage/package.use/uclibc -rm -f /etc/portage/savedconfig/sys-libs/uclibc -emerge -b1q uclibc - emerge -b1q binutils emerge -b1q gcc -emerge -b1q uclibc +emerge -b1q uclibc-ng emerge -b1q argp-standalone
