Merge remote-tracking branch 'origin/master' into catalyst3catalyst3

5 files changed, 25 insertions, 35 deletions

diff --git a/tools-uclibc/portage.i686.vanilla/env/net-misc_iputils_0 b/tools-uclibc/portage.i686.vanilla/env/net-misc_iputils_0
new file mode 100644
index 00000000..1e8c8462
--- /dev/null
+++ b/tools-uclibc/portage.i686.vanilla/env/net-misc_iputils_0
@@ -0,0 +1 @@
+LDFLAGS=-lm
diff --git a/tools-uclibc/portage.i686.vanilla/package.env b/tools-uclibc/portage.i686.vanilla/package.env
new file mode 100644
index 00000000..dd59e5f1
--- /dev/null
+++ b/tools-uclibc/portage.i686.vanilla/package.env
@@ -0,0 +1 @@
+net-misc/iputils net-misc_iputils_0
diff --git a/tools-uclibc/portage.i686.vanilla/package.use/uclibc b/tools-uclibc/portage.i686.vanilla/package.use/uclibc
deleted file mode 100644
index 0715d0b5..00000000
--- a/tools-uclibc/portage.i686.vanilla/package.use/uclibc
+++ /dev/null
@@ -1 +0,0 @@
-sys-libs/uclibc -* savedconfig
diff --git a/tools-uclibc/portage.i686.vanilla/package.use/uclibc-ng b/tools-uclibc/portage.i686.vanilla/package.use/uclibc-ng
new file mode 100644
index 00000000..7d19d509
--- /dev/null
+++ b/tools-uclibc/portage.i686.vanilla/package.use/uclibc-ng
@@ -0,0 +1 @@
+sys-libs/uclibc-ng -* savedconfig
diff --git a/tools-uclibc/portage.i686.vanilla/savedconfig/sys-libs/uclibc b/tools-uclibc/portage.i686.vanilla/savedconfig/sys-libs/uclibc-ng
index dfc0831e..100d234a 100644
--- a/tools-uclibc/portage.i686.vanilla/savedconfig/sys-libs/uclibc
+++ b/tools-uclibc/portage.i686.vanilla/savedconfig/sys-libs/uclibc-ng
@@ -1,32 +1,30 @@
 #
-# Automatically generated make config: don't edit
-# Version: 0.9.33
-# Sun Jun 10 08:56:18 2012
+# Automatically generated file; DO NOT EDIT.
+# uClibc-ng 0.1.0.16 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=y
-# TARGET_i960 is not set
 # TARGET_ia64 is not set
+# TARGET_lm32 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_nds32 is not set
 # TARGET_nios2 is not set
+# TARGET_or1k 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 is not set
 # TARGET_xtensa is not set
 
@@ -35,28 +33,16 @@ TARGET_i386=y
 #
 TARGET_ARCH="i386"
 FORCE_OPTIONS_FOR_ARCH=y
-# CONFIG_GENERIC_386 is not set
 # CONFIG_386 is not set
 # CONFIG_486 is not set
 # CONFIG_586 is not set
-# CONFIG_586MMX is not set
 CONFIG_686=y
-# CONFIG_PENTIUMII is not set
-# CONFIG_PENTIUMIII is not set
-# CONFIG_PENTIUM4 is not set
-# CONFIG_K6 is not set
-# CONFIG_K7 is not set
-# CONFIG_ELAN is not set
-# CONFIG_CRUSOE is not set
-# CONFIG_WINCHIPC6 is not set
-# CONFIG_WINCHIP2 is not set
-# CONFIG_CYRIXIII is not set
-# CONFIG_NEHEMIAH is not set
 TARGET_SUBARCH="i686"
 
 #
 # Using ELF file format
 #
+ARCH_HAS_DEPRECATED_SYSCALLS=y
 ARCH_LITTLE_ENDIAN=y
 
 #
@@ -77,6 +63,7 @@ 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
@@ -88,14 +75,14 @@ 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
@@ -106,9 +93,14 @@ UCLIBC_HAS_LFS=y
 # 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=y
+UCLIBC_SUSV2_LEGACY=y
 UCLIBC_SUSV3_LEGACY=y
+UCLIBC_HAS_CONTEXT_FUNCS=y
 UCLIBC_SUSV3_LEGACY_MACROS=y
 UCLIBC_SUSV4_LEGACY=y
 # UCLIBC_STRICT_HEADERS is not set
@@ -143,7 +135,7 @@ 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_BSD_SIGNAL=y
 # UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
 UCLIBC_NTP_LEGACY=y
 # UCLIBC_SV4_DEPRECATED is not set
@@ -151,7 +143,7 @@ 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_PROFILING=y
 UCLIBC_HAS_CRYPT_IMPL=y
 UCLIBC_HAS_SHA256_CRYPT_IMPL=y
 UCLIBC_HAS_SHA512_CRYPT_IMPL=y
@@ -177,6 +169,7 @@ UCLIBC_HAS_LIBNSL_STUB=y
 #
 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
@@ -187,8 +180,6 @@ UCLIBC_HAS_WCHAR=y
 UCLIBC_HAS_HEXADECIMAL_FLOATS=y
 UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
 UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
 # UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
 # UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
 # UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
@@ -212,8 +203,9 @@ UCLIBC_HAS_SYS_ERRLIST=y
 UCLIBC_HAS_SIGNUM_MESSAGES=y
 UCLIBC_HAS_SYS_SIGLIST=y
 UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_STDIO_FUTEXES=y
+UCLIBC_HAS_GETOPT_LONG=y
 UCLIBC_HAS_GNU_GETSUBOPT=y
+# UCLIBC_HAS_ARGP is not set
 
 #
 # Big and Tall
@@ -228,7 +220,6 @@ UCLIBC_HAS_FTW=y
 UCLIBC_HAS_FTS=y
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
-UCLIBC_HAS_UTMPX=y
 
 #
 # Library Installation Options
@@ -243,11 +234,9 @@ HARDWIRED_ABSPATH=y
 #
 UCLIBC_BUILD_PIE=y
 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
-# PROPOLICE_BLOCK_ABRT is not set
-PROPOLICE_BLOCK_SEGV=y
 UCLIBC_BUILD_SSP=y
 UCLIBC_BUILD_RELRO=y
 UCLIBC_BUILD_NOW=y
@@ -268,4 +257,3 @@ UCLIBC_HAS_BACKTRACE=y
 WARNINGS="-Wall"
 # EXTRA_WARNINGS is not set
 # DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set