Convert the rest of packages to new framework

Signed-off-by: Alexey Neyman <stilor@att.net>

22 files changed, 684 insertions, 0 deletions

diff --git a/packages/uClibc-ng/1.0.20/100-xtensa-static-link.patch b/packages/uClibc-ng/1.0.20/100-xtensa-static-link.patch
new file mode 100644
index 00000000..3f8a5182
--- /dev/null
+++ b/packages/uClibc-ng/1.0.20/100-xtensa-static-link.patch
@@ -0,0 +1,34 @@
+diff -urpN uClibc-ng-1.0.20.orig/libpthread/nptl/sysdeps/Makefile.commonarch uClibc-ng-1.0.20/libpthread/nptl/sysdeps/Makefile.commonarch
+--- uClibc-ng-1.0.20.orig/libpthread/nptl/sysdeps/Makefile.commonarch	2016-12-06 13:02:51.385861492 -0800
++++ uClibc-ng-1.0.20/libpthread/nptl/sysdeps/Makefile.commonarch	2016-12-06 19:08:53.150146970 -0800
+@@ -32,10 +32,11 @@ libpthread_arch_SOBJ = $(patsubst %.S,$(
+ libpthread_arch_OBJS = $(libpthread_subarch_OBJS) $(libpthread_arch_COBJ) $(libpthread_arch_SOBJ)
+ 
+ libc_arch_COBJ = $(patsubst %.c,$(libpthread_arch_OUT)/%.o,$(libc_arch_CSRC))
+-libc_arch_SOBJ = $(patsubst %.c,$(libpthread_arch_OUT)/%.o,$(libc_arch_SSRC))
++libc_arch_SOBJ = $(patsubst %.S,$(libpthread_arch_OUT)/%.o,$(libc_arch_SSRC))
+ libc_arch_OBJS = $(libc_arch_COBJ) $(libc_arch_SOBJ)
+ libc_arch_a_COBJ = $(patsubst %.c,$(libpthread_arch_OUT)/%.o,$(libc_arch_a_CSRC))
+-libc_arch_a_OBJS = $(libc_arch_a_COBJ)
++libc_arch_a_SOBJ = $(patsubst %.S,$(libpthread_arch_OUT)/%.o,$(libc_arch_a_SSRC))
++libc_arch_a_OBJS = $(libc_arch_a_COBJ) $(libc_arch_a_SOBJ)
+ 
+ librt_arch_COBJ = $(patsubst %.c,$(libpthread_arch_OUT)/%.o,$(librt_arch_CSRC))
+ librt_arch_SOBJ = $(patsubst %.S,$(libpthread_arch_OUT)/%.o,$(librt_arch_SSRC))
+diff -urpN uClibc-ng-1.0.20.orig/libpthread/nptl/sysdeps/xtensa/libc-dl-tlsdesc.S uClibc-ng-1.0.20/libpthread/nptl/sysdeps/xtensa/libc-dl-tlsdesc.S
+--- uClibc-ng-1.0.20.orig/libpthread/nptl/sysdeps/xtensa/libc-dl-tlsdesc.S	1969-12-31 16:00:00.000000000 -0800
++++ uClibc-ng-1.0.20/libpthread/nptl/sysdeps/xtensa/libc-dl-tlsdesc.S	2016-12-06 19:08:53.150146970 -0800
+@@ -0,0 +1 @@
++#include <ldso/ldso/xtensa/dl-tlsdesc.S>
+diff -urpN uClibc-ng-1.0.20.orig/libpthread/nptl/sysdeps/xtensa/Makefile.arch uClibc-ng-1.0.20/libpthread/nptl/sysdeps/xtensa/Makefile.arch
+--- uClibc-ng-1.0.20.orig/libpthread/nptl/sysdeps/xtensa/Makefile.arch	2016-12-06 13:02:51.401861642 -0800
++++ uClibc-ng-1.0.20/libpthread/nptl/sysdeps/xtensa/Makefile.arch	2016-12-06 19:08:53.150146970 -0800
+@@ -20,7 +20,7 @@
+ ASFLAGS-pthread_spin_trylock.S = -DNOT_IN_libc -DIS_IN_libpthread
+ 
+ libc_arch_a_CSRC = libc-tls.c
+-librt_arch_a_SSRC = dl-tlsdesc.S
++libc_arch_a_SSRC = libc-dl-tlsdesc.S
+ 
+ CFLAGS-gen_tlsdesc.c = -S
+ $(libpthread_arch_OUT)/gen_tlsdesc.c: $(libpthread_arch_DIR)/tlsdesc.sym | $(libpthread_arch_OUT)
diff --git a/packages/uClibc-ng/1.0.20/110-has-lfs.patch b/packages/uClibc-ng/1.0.20/110-has-lfs.patch
new file mode 100644
index 00000000..c5b90de8
--- /dev/null
+++ b/packages/uClibc-ng/1.0.20/110-has-lfs.patch
@@ -0,0 +1,31 @@
+From 2a40d18badc4f0bff8c2e02507cd8d59cfeb3e7c Mon Sep 17 00:00:00 2001
+From: Alexey Neyman <stilor@att.net>
+Date: Mon, 23 Jan 2017 14:21:54 -0800
+Subject: [PATCH] Restore UCLIBC_HAS_LFS as "always enabled".
+
+Otherwise, buildroot rejects uClibc-ng in an external toolchain.
+
+Signed-off-by: Alexey Neyman <stilor@att.net>
+---
+ extra/Configs/Config.in | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in
+index a9d62f5..b2cf977 100644
+--- a/extra/Configs/Config.in
++++ b/extra/Configs/Config.in
+@@ -566,6 +566,11 @@ config UCLIBC_HAS_SYSLOG
+ 	  Support sending messages to the system logger.
+ 	  This requires socket-support.
+ 
++config UCLIBC_HAS_LFS
++	def_bool y
++	help
++	  Large file support (always enabled; config symbol retained for
++	  feature test to be compatible with uClibc).
+ choice
+ 	prompt "Malloc Implementation"
+ 	default MALLOC if ! ARCH_USE_MMU
+-- 
+2.9.3
+
diff --git a/packages/uClibc-ng/1.0.20/500-no-install-D.patch b/packages/uClibc-ng/1.0.20/500-no-install-D.patch
new file mode 100644
index 00000000..83d3ff61
--- /dev/null
+++ b/packages/uClibc-ng/1.0.20/500-no-install-D.patch
@@ -0,0 +1,30 @@
+diff -urpN uClibc-ng-1.0.22.orig/utils/Makefile.in uClibc-ng-1.0.22/utils/Makefile.in
+--- uClibc-ng-1.0.22.orig/utils/Makefile.in	2017-03-01 08:27:07.000000000 -0800
++++ uClibc-ng-1.0.22/utils/Makefile.in	2017-03-01 08:43:25.000000000 -0800
+@@ -117,15 +117,22 @@ $(hostutils_OBJ): $(utils_OUT)/%.host : 
+ install-y += utils_install
+ 
+ # This installs both utils and hostutils, so doesn't depend on either.
++$(PREFIX)$(DEVEL_PREFIX)bin $(PREFIX)$(RUNTIME_PREFIX)sbin:
++	$(do_mkdir)
++
++utils_install: $(PREFIX)$(DEVEL_PREFIX)bin
++ifeq ($(HAVE_SHARED),y)
++utils_install: $(PREFIX)$(RUNTIME_PREFIX)sbin
++endif
+ 
+ utils_install: $(addsuffix $(DOTHOST), $(utils_OBJ) $(utils_LOCALE_OBJ))
+-	$(Q)$(INSTALL) -D -m 755 $(utils_OUT)/getconf$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/getconf
++	$(Q)$(INSTALL) -m 755 $(utils_OUT)/getconf$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/getconf
+ ifeq ($(HAVE_SHARED),y)
+-	$(Q)$(INSTALL) -D -m 755 $(utils_OUT)/ldd$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/ldd
+-	$(Q)$(INSTALL) -D -m 755 $(utils_OUT)/ldconfig$(DOTHOST) $(PREFIX)$(RUNTIME_PREFIX)sbin/ldconfig
++	$(Q)$(INSTALL) -m 755 $(utils_OUT)/ldd$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/ldd
++	$(Q)$(INSTALL) -m 755 $(utils_OUT)/ldconfig$(DOTHOST) $(PREFIX)$(RUNTIME_PREFIX)sbin/ldconfig
+ endif
+ ifeq ($(UCLIBC_HAS_LOCALE),y)
+-	$(Q)$(INSTALL) -D -m 755 $(utils_OUT)/iconv$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/iconv
++	$(Q)$(INSTALL) -m 755 $(utils_OUT)/iconv$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/iconv
+ 	$(Q)$(INSTALL) -m 755 $(utils_OUT)/locale$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/locale
+ endif
+ 
diff --git a/packages/uClibc-ng/1.0.20/600-prefer-multilib.patch b/packages/uClibc-ng/1.0.20/600-prefer-multilib.patch
new file mode 100644
index 00000000..4338f9fd
--- /dev/null
+++ b/packages/uClibc-ng/1.0.20/600-prefer-multilib.patch
@@ -0,0 +1,46 @@
+diff -urpN uClibc-ng-1.0.22.orig/ldso/ldso/dl-elf.c uClibc-ng-1.0.22/ldso/ldso/dl-elf.c
+--- uClibc-ng-1.0.22.orig/ldso/ldso/dl-elf.c	2017-03-14 12:17:57.754063532 -0700
++++ uClibc-ng-1.0.22/ldso/ldso/dl-elf.c	2017-03-14 17:14:21.846398236 -0700
+@@ -307,6 +307,19 @@ struct elf_resolve *_dl_load_shared_libr
+ 		}
+ 	}
+ #endif
++
++#ifdef LDSO_MULTILIB_DIR
++	/* If multilib directory is selected, search it before falling back to
++	   standard lib directories. */
++	_dl_if_debug_dprint("\tsearching multilib lib path list\n");
++	tpnt1 = search_for_named_library(libname, rflags,
++					UCLIBC_RUNTIME_PREFIX LDSO_MULTILIB_DIR ":"
++					UCLIBC_RUNTIME_PREFIX "usr" LDSO_MULTILIB_DIR,
++					rpnt, NULL);
++	if (tpnt1 != NULL)
++		return tpnt1;
++#endif
++
+ #if defined SHARED && defined __LDSO_SEARCH_INTERP_PATH__
+ 	/* Look for libraries wherever the shared library loader
+ 	 * was installed */
+@@ -315,6 +328,7 @@ struct elf_resolve *_dl_load_shared_libr
+ 	if (tpnt1 != NULL)
+ 		return tpnt1;
+ #endif
++
+ 	/* Lastly, search the standard list of paths for the library.
+ 	   This list must exactly match the list in uClibc/ldso/util/ldd.c */
+ 	_dl_if_debug_dprint("\tsearching full lib path list\n");
+diff -urpN uClibc-ng-1.0.22.orig/ldso/ldso/Makefile.in uClibc-ng-1.0.22/ldso/ldso/Makefile.in
+--- uClibc-ng-1.0.22.orig/ldso/ldso/Makefile.in	2017-03-14 12:17:57.754063532 -0700
++++ uClibc-ng-1.0.22/ldso/ldso/Makefile.in	2017-03-14 15:35:35.277104175 -0700
+@@ -34,6 +34,11 @@ CFLAGS-$(DODEBUG)-ldso/ldso := -O2 -g
+ 
+ CFLAGS-ldso.c := -DLDSO_ELFINTERP=\"$(TARGET_ARCH)/elfinterp.c\"
+ 
++# Search non-default multilib directories
++ifneq ($(MULTILIB_DIR),lib)
++CFLAGS-ldso.c	+= -DLDSO_MULTILIB_DIR=\"$(MULTILIB_DIR)\"
++endif
++
+ ifeq ($(TARGET_ARCH),arc)
+ CFLAGS-ldso.c += -mno-long-calls
+ endif
diff --git a/packages/uClibc-ng/1.0.20/700-features.h-c11.patch b/packages/uClibc-ng/1.0.20/700-features.h-c11.patch
new file mode 100644
index 00000000..cb1d2a8e
--- /dev/null
+++ b/packages/uClibc-ng/1.0.20/700-features.h-c11.patch
@@ -0,0 +1,61 @@
+From 5b0f49037e8ea8500b05c8f31ee88529ccac4cee Mon Sep 17 00:00:00 2001
+From: Waldemar Brodkorb <wbx@openadk.org>
+Date: Sun, 7 May 2017 16:28:14 +0200
+Subject: sync features.h with GNU C library, fixes gcc 7.1 toolchain creation
+
+---
+ include/features.h | 17 ++++++++++++-----
+ 1 file changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/include/features.h b/include/features.h
+index e76bbba..f982079 100644
+--- a/include/features.h
++++ b/include/features.h
+@@ -55,6 +55,7 @@
+    These are defined by this file and are used by the
+    header files to decide what to declare or define:
+ 
++   __USE_ISOC11		Define ISO C11 things.
+    __USE_ISOC99		Define ISO C99 things.
+    __USE_ISOC95		Define ISO C90 AMD1 (C95) things.
+    __USE_POSIX		Define IEEE Std 1003.1 things.
+@@ -91,6 +92,7 @@
+ 
+ 
+ /* Undefine everything, so we get a clean slate.  */
++#undef	__USE_ISOC11
+ #undef	__USE_ISOC99
+ #undef	__USE_ISOC95
+ #undef	__USE_POSIX
+@@ -151,6 +153,8 @@
+ #ifdef _GNU_SOURCE
+ # undef  _ISOC99_SOURCE
+ # define _ISOC99_SOURCE	1
++# undef  _ISOC11_SOURCE
++# define _ISOC11_SOURCE	1
+ # undef  _POSIX_SOURCE
+ # define _POSIX_SOURCE	1
+ # undef  _POSIX_C_SOURCE
+@@ -223,11 +227,14 @@
+ # define _SVID_SOURCE	1
+ #endif
+ 
+-/* This is to enable the ISO C99 extension.  Also recognize the old macro
+-   which was used prior to the standard acceptance.  This macro will
+-   eventually go away and the features enabled by default once the ISO C99
+-   standard is widely adopted.  */
+-#if (defined _ISOC99_SOURCE || defined _ISOC9X_SOURCE \
++/* This is to enable the ISO C11 extension.  */
++#if (defined _ISOC11_SOURCE \
++     || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 201112L))
++# define __USE_ISOC11	1
++#endif
++
++/* This is to enable the ISO C99 extension.  */
++#if (defined _ISOC99_SOURCE || defined _ISOC11_SOURCE \
+      || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L))
+ # define __USE_ISOC99	1
+ #endif
+-- 
+cgit v0.11.2-3-g2eb4
+
diff --git a/packages/uClibc-ng/1.0.20/version.desc b/packages/uClibc-ng/1.0.20/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/uClibc-ng/1.0.20/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/uClibc-ng/1.0.21/110-has-lfs.patch b/packages/uClibc-ng/1.0.21/110-has-lfs.patch
new file mode 100644
index 00000000..c5b90de8
--- /dev/null
+++ b/packages/uClibc-ng/1.0.21/110-has-lfs.patch
@@ -0,0 +1,31 @@
+From 2a40d18badc4f0bff8c2e02507cd8d59cfeb3e7c Mon Sep 17 00:00:00 2001
+From: Alexey Neyman <stilor@att.net>
+Date: Mon, 23 Jan 2017 14:21:54 -0800
+Subject: [PATCH] Restore UCLIBC_HAS_LFS as "always enabled".
+
+Otherwise, buildroot rejects uClibc-ng in an external toolchain.
+
+Signed-off-by: Alexey Neyman <stilor@att.net>
+---
+ extra/Configs/Config.in | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in
+index a9d62f5..b2cf977 100644
+--- a/extra/Configs/Config.in
++++ b/extra/Configs/Config.in
+@@ -566,6 +566,11 @@ config UCLIBC_HAS_SYSLOG
+ 	  Support sending messages to the system logger.
+ 	  This requires socket-support.
+ 
++config UCLIBC_HAS_LFS
++	def_bool y
++	help
++	  Large file support (always enabled; config symbol retained for
++	  feature test to be compatible with uClibc).
+ choice
+ 	prompt "Malloc Implementation"
+ 	default MALLOC if ! ARCH_USE_MMU
+-- 
+2.9.3
+
diff --git a/packages/uClibc-ng/1.0.21/120-module.patch b/packages/uClibc-ng/1.0.21/120-module.patch
new file mode 100644
index 00000000..2e8a989b
--- /dev/null
+++ b/packages/uClibc-ng/1.0.21/120-module.patch
@@ -0,0 +1,50 @@
+commit 03884934b32c79da545ef38a42835a6c257b125d
+Author: Waldemar Brodkorb <wbx@uclibc-ng.org>
+Date:   Tue Dec 27 09:24:24 2016 +0100
+
+    add init_module/delete_module syscall wrappers
+    
+    Add the wrappers unconditionally, because kmod package
+    still uses them.
+
+diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in
+index 595074c..faed6fd 100644
+--- a/libc/sysdeps/linux/common/Makefile.in
++++ b/libc/sysdeps/linux/common/Makefile.in
+@@ -31,6 +31,7 @@ CSRC-$(UCLIBC_LINUX_SPECIFIC) += \
+ 	ioperm.c \
+ 	iopl.c \
+ 	modify_ldt.c \
++	module.c \
+ 	personality.c \
+ 	pipe2.c \
+ 	ppoll.c \
+diff --git a/libc/sysdeps/linux/common/module.c b/libc/sysdeps/linux/common/module.c
+new file mode 100644
+index 0000000..146a43e
+--- /dev/null
++++ b/libc/sysdeps/linux/common/module.c
+@@ -0,0 +1,23 @@
++/*
++ * init_module()/delete_module() for uClibc
++ *
++ * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
++ *
++ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
++ */
++
++#include <sys/syscall.h>
++
++#ifdef __NR_init_module
++int init_module(void *first, void *second, void *third, void *fourth, void *fifth);
++/* This may have 5 arguments (for old 2.0 kernels) or 2 arguments
++ * (for 2.2 and 2.4 kernels).  Use the greatest common denominator,
++ * and let the kernel cope with whatever it gets.  It's good at that. */
++_syscall5(int, init_module, void *, first, void *, second, void *, third,
++	  void *, fourth, void *, fifth)
++#endif
++
++#ifdef __NR_delete_module
++int delete_module(const char *name, unsigned int flags);
++_syscall2(int, delete_module, const char *, name, unsigned int, flags)
++#endif
diff --git a/packages/uClibc-ng/1.0.21/500-no-install-D.patch b/packages/uClibc-ng/1.0.21/500-no-install-D.patch
new file mode 100644
index 00000000..83d3ff61
--- /dev/null
+++ b/packages/uClibc-ng/1.0.21/500-no-install-D.patch
@@ -0,0 +1,30 @@
+diff -urpN uClibc-ng-1.0.22.orig/utils/Makefile.in uClibc-ng-1.0.22/utils/Makefile.in
+--- uClibc-ng-1.0.22.orig/utils/Makefile.in	2017-03-01 08:27:07.000000000 -0800
++++ uClibc-ng-1.0.22/utils/Makefile.in	2017-03-01 08:43:25.000000000 -0800
+@@ -117,15 +117,22 @@ $(hostutils_OBJ): $(utils_OUT)/%.host : 
+ install-y += utils_install
+ 
+ # This installs both utils and hostutils, so doesn't depend on either.
++$(PREFIX)$(DEVEL_PREFIX)bin $(PREFIX)$(RUNTIME_PREFIX)sbin:
++	$(do_mkdir)
++
++utils_install: $(PREFIX)$(DEVEL_PREFIX)bin
++ifeq ($(HAVE_SHARED),y)
++utils_install: $(PREFIX)$(RUNTIME_PREFIX)sbin
++endif
+ 
+ utils_install: $(addsuffix $(DOTHOST), $(utils_OBJ) $(utils_LOCALE_OBJ))
+-	$(Q)$(INSTALL) -D -m 755 $(utils_OUT)/getconf$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/getconf
++	$(Q)$(INSTALL) -m 755 $(utils_OUT)/getconf$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/getconf
+ ifeq ($(HAVE_SHARED),y)
+-	$(Q)$(INSTALL) -D -m 755 $(utils_OUT)/ldd$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/ldd
+-	$(Q)$(INSTALL) -D -m 755 $(utils_OUT)/ldconfig$(DOTHOST) $(PREFIX)$(RUNTIME_PREFIX)sbin/ldconfig
++	$(Q)$(INSTALL) -m 755 $(utils_OUT)/ldd$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/ldd
++	$(Q)$(INSTALL) -m 755 $(utils_OUT)/ldconfig$(DOTHOST) $(PREFIX)$(RUNTIME_PREFIX)sbin/ldconfig
+ endif
+ ifeq ($(UCLIBC_HAS_LOCALE),y)
+-	$(Q)$(INSTALL) -D -m 755 $(utils_OUT)/iconv$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/iconv
++	$(Q)$(INSTALL) -m 755 $(utils_OUT)/iconv$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/iconv
+ 	$(Q)$(INSTALL) -m 755 $(utils_OUT)/locale$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/locale
+ endif
+ 
diff --git a/packages/uClibc-ng/1.0.21/600-prefer-multilib.patch b/packages/uClibc-ng/1.0.21/600-prefer-multilib.patch
new file mode 100644
index 00000000..4338f9fd
--- /dev/null
+++ b/packages/uClibc-ng/1.0.21/600-prefer-multilib.patch
@@ -0,0 +1,46 @@
+diff -urpN uClibc-ng-1.0.22.orig/ldso/ldso/dl-elf.c uClibc-ng-1.0.22/ldso/ldso/dl-elf.c
+--- uClibc-ng-1.0.22.orig/ldso/ldso/dl-elf.c	2017-03-14 12:17:57.754063532 -0700
++++ uClibc-ng-1.0.22/ldso/ldso/dl-elf.c	2017-03-14 17:14:21.846398236 -0700
+@@ -307,6 +307,19 @@ struct elf_resolve *_dl_load_shared_libr
+ 		}
+ 	}
+ #endif
++
++#ifdef LDSO_MULTILIB_DIR
++	/* If multilib directory is selected, search it before falling back to
++	   standard lib directories. */
++	_dl_if_debug_dprint("\tsearching multilib lib path list\n");
++	tpnt1 = search_for_named_library(libname, rflags,
++					UCLIBC_RUNTIME_PREFIX LDSO_MULTILIB_DIR ":"
++					UCLIBC_RUNTIME_PREFIX "usr" LDSO_MULTILIB_DIR,
++					rpnt, NULL);
++	if (tpnt1 != NULL)
++		return tpnt1;
++#endif
++
+ #if defined SHARED && defined __LDSO_SEARCH_INTERP_PATH__
+ 	/* Look for libraries wherever the shared library loader
+ 	 * was installed */
+@@ -315,6 +328,7 @@ struct elf_resolve *_dl_load_shared_libr
+ 	if (tpnt1 != NULL)
+ 		return tpnt1;
+ #endif
++
+ 	/* Lastly, search the standard list of paths for the library.
+ 	   This list must exactly match the list in uClibc/ldso/util/ldd.c */
+ 	_dl_if_debug_dprint("\tsearching full lib path list\n");
+diff -urpN uClibc-ng-1.0.22.orig/ldso/ldso/Makefile.in uClibc-ng-1.0.22/ldso/ldso/Makefile.in
+--- uClibc-ng-1.0.22.orig/ldso/ldso/Makefile.in	2017-03-14 12:17:57.754063532 -0700
++++ uClibc-ng-1.0.22/ldso/ldso/Makefile.in	2017-03-14 15:35:35.277104175 -0700
+@@ -34,6 +34,11 @@ CFLAGS-$(DODEBUG)-ldso/ldso := -O2 -g
+ 
+ CFLAGS-ldso.c := -DLDSO_ELFINTERP=\"$(TARGET_ARCH)/elfinterp.c\"
+ 
++# Search non-default multilib directories
++ifneq ($(MULTILIB_DIR),lib)
++CFLAGS-ldso.c	+= -DLDSO_MULTILIB_DIR=\"$(MULTILIB_DIR)\"
++endif
++
+ ifeq ($(TARGET_ARCH),arc)
+ CFLAGS-ldso.c += -mno-long-calls
+ endif
diff --git a/packages/uClibc-ng/1.0.21/700-features.h-c11.patch b/packages/uClibc-ng/1.0.21/700-features.h-c11.patch
new file mode 100644
index 00000000..cb1d2a8e
--- /dev/null
+++ b/packages/uClibc-ng/1.0.21/700-features.h-c11.patch
@@ -0,0 +1,61 @@
+From 5b0f49037e8ea8500b05c8f31ee88529ccac4cee Mon Sep 17 00:00:00 2001
+From: Waldemar Brodkorb <wbx@openadk.org>
+Date: Sun, 7 May 2017 16:28:14 +0200
+Subject: sync features.h with GNU C library, fixes gcc 7.1 toolchain creation
+
+---
+ include/features.h | 17 ++++++++++++-----
+ 1 file changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/include/features.h b/include/features.h
+index e76bbba..f982079 100644
+--- a/include/features.h
++++ b/include/features.h
+@@ -55,6 +55,7 @@
+    These are defined by this file and are used by the
+    header files to decide what to declare or define:
+ 
++   __USE_ISOC11		Define ISO C11 things.
+    __USE_ISOC99		Define ISO C99 things.
+    __USE_ISOC95		Define ISO C90 AMD1 (C95) things.
+    __USE_POSIX		Define IEEE Std 1003.1 things.
+@@ -91,6 +92,7 @@
+ 
+ 
+ /* Undefine everything, so we get a clean slate.  */
++#undef	__USE_ISOC11
+ #undef	__USE_ISOC99
+ #undef	__USE_ISOC95
+ #undef	__USE_POSIX
+@@ -151,6 +153,8 @@
+ #ifdef _GNU_SOURCE
+ # undef  _ISOC99_SOURCE
+ # define _ISOC99_SOURCE	1
++# undef  _ISOC11_SOURCE
++# define _ISOC11_SOURCE	1
+ # undef  _POSIX_SOURCE
+ # define _POSIX_SOURCE	1
+ # undef  _POSIX_C_SOURCE
+@@ -223,11 +227,14 @@
+ # define _SVID_SOURCE	1
+ #endif
+ 
+-/* This is to enable the ISO C99 extension.  Also recognize the old macro
+-   which was used prior to the standard acceptance.  This macro will
+-   eventually go away and the features enabled by default once the ISO C99
+-   standard is widely adopted.  */
+-#if (defined _ISOC99_SOURCE || defined _ISOC9X_SOURCE \
++/* This is to enable the ISO C11 extension.  */
++#if (defined _ISOC11_SOURCE \
++     || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 201112L))
++# define __USE_ISOC11	1
++#endif
++
++/* This is to enable the ISO C99 extension.  */
++#if (defined _ISOC99_SOURCE || defined _ISOC11_SOURCE \
+      || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L))
+ # define __USE_ISOC99	1
+ #endif
+-- 
+cgit v0.11.2-3-g2eb4
+
diff --git a/packages/uClibc-ng/1.0.21/version.desc b/packages/uClibc-ng/1.0.21/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/uClibc-ng/1.0.21/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/uClibc-ng/1.0.22/500-no-install-D.patch b/packages/uClibc-ng/1.0.22/500-no-install-D.patch
new file mode 100644
index 00000000..83d3ff61
--- /dev/null
+++ b/packages/uClibc-ng/1.0.22/500-no-install-D.patch
@@ -0,0 +1,30 @@
+diff -urpN uClibc-ng-1.0.22.orig/utils/Makefile.in uClibc-ng-1.0.22/utils/Makefile.in
+--- uClibc-ng-1.0.22.orig/utils/Makefile.in	2017-03-01 08:27:07.000000000 -0800
++++ uClibc-ng-1.0.22/utils/Makefile.in	2017-03-01 08:43:25.000000000 -0800
+@@ -117,15 +117,22 @@ $(hostutils_OBJ): $(utils_OUT)/%.host : 
+ install-y += utils_install
+ 
+ # This installs both utils and hostutils, so doesn't depend on either.
++$(PREFIX)$(DEVEL_PREFIX)bin $(PREFIX)$(RUNTIME_PREFIX)sbin:
++	$(do_mkdir)
++
++utils_install: $(PREFIX)$(DEVEL_PREFIX)bin
++ifeq ($(HAVE_SHARED),y)
++utils_install: $(PREFIX)$(RUNTIME_PREFIX)sbin
++endif
+ 
+ utils_install: $(addsuffix $(DOTHOST), $(utils_OBJ) $(utils_LOCALE_OBJ))
+-	$(Q)$(INSTALL) -D -m 755 $(utils_OUT)/getconf$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/getconf
++	$(Q)$(INSTALL) -m 755 $(utils_OUT)/getconf$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/getconf
+ ifeq ($(HAVE_SHARED),y)
+-	$(Q)$(INSTALL) -D -m 755 $(utils_OUT)/ldd$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/ldd
+-	$(Q)$(INSTALL) -D -m 755 $(utils_OUT)/ldconfig$(DOTHOST) $(PREFIX)$(RUNTIME_PREFIX)sbin/ldconfig
++	$(Q)$(INSTALL) -m 755 $(utils_OUT)/ldd$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/ldd
++	$(Q)$(INSTALL) -m 755 $(utils_OUT)/ldconfig$(DOTHOST) $(PREFIX)$(RUNTIME_PREFIX)sbin/ldconfig
+ endif
+ ifeq ($(UCLIBC_HAS_LOCALE),y)
+-	$(Q)$(INSTALL) -D -m 755 $(utils_OUT)/iconv$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/iconv
++	$(Q)$(INSTALL) -m 755 $(utils_OUT)/iconv$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/iconv
+ 	$(Q)$(INSTALL) -m 755 $(utils_OUT)/locale$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/locale
+ endif
+ 
diff --git a/packages/uClibc-ng/1.0.22/600-prefer-multilib.patch b/packages/uClibc-ng/1.0.22/600-prefer-multilib.patch
new file mode 100644
index 00000000..4338f9fd
--- /dev/null
+++ b/packages/uClibc-ng/1.0.22/600-prefer-multilib.patch
@@ -0,0 +1,46 @@
+diff -urpN uClibc-ng-1.0.22.orig/ldso/ldso/dl-elf.c uClibc-ng-1.0.22/ldso/ldso/dl-elf.c
+--- uClibc-ng-1.0.22.orig/ldso/ldso/dl-elf.c	2017-03-14 12:17:57.754063532 -0700
++++ uClibc-ng-1.0.22/ldso/ldso/dl-elf.c	2017-03-14 17:14:21.846398236 -0700
+@@ -307,6 +307,19 @@ struct elf_resolve *_dl_load_shared_libr
+ 		}
+ 	}
+ #endif
++
++#ifdef LDSO_MULTILIB_DIR
++	/* If multilib directory is selected, search it before falling back to
++	   standard lib directories. */
++	_dl_if_debug_dprint("\tsearching multilib lib path list\n");
++	tpnt1 = search_for_named_library(libname, rflags,
++					UCLIBC_RUNTIME_PREFIX LDSO_MULTILIB_DIR ":"
++					UCLIBC_RUNTIME_PREFIX "usr" LDSO_MULTILIB_DIR,
++					rpnt, NULL);
++	if (tpnt1 != NULL)
++		return tpnt1;
++#endif
++
+ #if defined SHARED && defined __LDSO_SEARCH_INTERP_PATH__
+ 	/* Look for libraries wherever the shared library loader
+ 	 * was installed */
+@@ -315,6 +328,7 @@ struct elf_resolve *_dl_load_shared_libr
+ 	if (tpnt1 != NULL)
+ 		return tpnt1;
+ #endif
++
+ 	/* Lastly, search the standard list of paths for the library.
+ 	   This list must exactly match the list in uClibc/ldso/util/ldd.c */
+ 	_dl_if_debug_dprint("\tsearching full lib path list\n");
+diff -urpN uClibc-ng-1.0.22.orig/ldso/ldso/Makefile.in uClibc-ng-1.0.22/ldso/ldso/Makefile.in
+--- uClibc-ng-1.0.22.orig/ldso/ldso/Makefile.in	2017-03-14 12:17:57.754063532 -0700
++++ uClibc-ng-1.0.22/ldso/ldso/Makefile.in	2017-03-14 15:35:35.277104175 -0700
+@@ -34,6 +34,11 @@ CFLAGS-$(DODEBUG)-ldso/ldso := -O2 -g
+ 
+ CFLAGS-ldso.c := -DLDSO_ELFINTERP=\"$(TARGET_ARCH)/elfinterp.c\"
+ 
++# Search non-default multilib directories
++ifneq ($(MULTILIB_DIR),lib)
++CFLAGS-ldso.c	+= -DLDSO_MULTILIB_DIR=\"$(MULTILIB_DIR)\"
++endif
++
+ ifeq ($(TARGET_ARCH),arc)
+ CFLAGS-ldso.c += -mno-long-calls
+ endif
diff --git a/packages/uClibc-ng/1.0.22/700-features.h-c11.patch b/packages/uClibc-ng/1.0.22/700-features.h-c11.patch
new file mode 100644
index 00000000..cb1d2a8e
--- /dev/null
+++ b/packages/uClibc-ng/1.0.22/700-features.h-c11.patch
@@ -0,0 +1,61 @@
+From 5b0f49037e8ea8500b05c8f31ee88529ccac4cee Mon Sep 17 00:00:00 2001
+From: Waldemar Brodkorb <wbx@openadk.org>
+Date: Sun, 7 May 2017 16:28:14 +0200
+Subject: sync features.h with GNU C library, fixes gcc 7.1 toolchain creation
+
+---
+ include/features.h | 17 ++++++++++++-----
+ 1 file changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/include/features.h b/include/features.h
+index e76bbba..f982079 100644
+--- a/include/features.h
++++ b/include/features.h
+@@ -55,6 +55,7 @@
+    These are defined by this file and are used by the
+    header files to decide what to declare or define:
+ 
++   __USE_ISOC11		Define ISO C11 things.
+    __USE_ISOC99		Define ISO C99 things.
+    __USE_ISOC95		Define ISO C90 AMD1 (C95) things.
+    __USE_POSIX		Define IEEE Std 1003.1 things.
+@@ -91,6 +92,7 @@
+ 
+ 
+ /* Undefine everything, so we get a clean slate.  */
++#undef	__USE_ISOC11
+ #undef	__USE_ISOC99
+ #undef	__USE_ISOC95
+ #undef	__USE_POSIX
+@@ -151,6 +153,8 @@
+ #ifdef _GNU_SOURCE
+ # undef  _ISOC99_SOURCE
+ # define _ISOC99_SOURCE	1
++# undef  _ISOC11_SOURCE
++# define _ISOC11_SOURCE	1
+ # undef  _POSIX_SOURCE
+ # define _POSIX_SOURCE	1
+ # undef  _POSIX_C_SOURCE
+@@ -223,11 +227,14 @@
+ # define _SVID_SOURCE	1
+ #endif
+ 
+-/* This is to enable the ISO C99 extension.  Also recognize the old macro
+-   which was used prior to the standard acceptance.  This macro will
+-   eventually go away and the features enabled by default once the ISO C99
+-   standard is widely adopted.  */
+-#if (defined _ISOC99_SOURCE || defined _ISOC9X_SOURCE \
++/* This is to enable the ISO C11 extension.  */
++#if (defined _ISOC11_SOURCE \
++     || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 201112L))
++# define __USE_ISOC11	1
++#endif
++
++/* This is to enable the ISO C99 extension.  */
++#if (defined _ISOC99_SOURCE || defined _ISOC11_SOURCE \
+      || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L))
+ # define __USE_ISOC99	1
+ #endif
+-- 
+cgit v0.11.2-3-g2eb4
+
diff --git a/packages/uClibc-ng/1.0.22/version.desc b/packages/uClibc-ng/1.0.22/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/uClibc-ng/1.0.22/version.desc
diff --git a/packages/uClibc-ng/1.0.23/700-features.h-c11.patch b/packages/uClibc-ng/1.0.23/700-features.h-c11.patch
new file mode 100644
index 00000000..cb1d2a8e
--- /dev/null
+++ b/packages/uClibc-ng/1.0.23/700-features.h-c11.patch
@@ -0,0 +1,61 @@
+From 5b0f49037e8ea8500b05c8f31ee88529ccac4cee Mon Sep 17 00:00:00 2001
+From: Waldemar Brodkorb <wbx@openadk.org>
+Date: Sun, 7 May 2017 16:28:14 +0200
+Subject: sync features.h with GNU C library, fixes gcc 7.1 toolchain creation
+
+---
+ include/features.h | 17 ++++++++++++-----
+ 1 file changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/include/features.h b/include/features.h
+index e76bbba..f982079 100644
+--- a/include/features.h
++++ b/include/features.h
+@@ -55,6 +55,7 @@
+    These are defined by this file and are used by the
+    header files to decide what to declare or define:
+ 
++   __USE_ISOC11		Define ISO C11 things.
+    __USE_ISOC99		Define ISO C99 things.
+    __USE_ISOC95		Define ISO C90 AMD1 (C95) things.
+    __USE_POSIX		Define IEEE Std 1003.1 things.
+@@ -91,6 +92,7 @@
+ 
+ 
+ /* Undefine everything, so we get a clean slate.  */
++#undef	__USE_ISOC11
+ #undef	__USE_ISOC99
+ #undef	__USE_ISOC95
+ #undef	__USE_POSIX
+@@ -151,6 +153,8 @@
+ #ifdef _GNU_SOURCE
+ # undef  _ISOC99_SOURCE
+ # define _ISOC99_SOURCE	1
++# undef  _ISOC11_SOURCE
++# define _ISOC11_SOURCE	1
+ # undef  _POSIX_SOURCE
+ # define _POSIX_SOURCE	1
+ # undef  _POSIX_C_SOURCE
+@@ -223,11 +227,14 @@
+ # define _SVID_SOURCE	1
+ #endif
+ 
+-/* This is to enable the ISO C99 extension.  Also recognize the old macro
+-   which was used prior to the standard acceptance.  This macro will
+-   eventually go away and the features enabled by default once the ISO C99
+-   standard is widely adopted.  */
+-#if (defined _ISOC99_SOURCE || defined _ISOC9X_SOURCE \
++/* This is to enable the ISO C11 extension.  */
++#if (defined _ISOC11_SOURCE \
++     || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 201112L))
++# define __USE_ISOC11	1
++#endif
++
++/* This is to enable the ISO C99 extension.  */
++#if (defined _ISOC99_SOURCE || defined _ISOC11_SOURCE \
+      || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L))
+ # define __USE_ISOC99	1
+ #endif
+-- 
+cgit v0.11.2-3-g2eb4
+
diff --git a/packages/uClibc-ng/1.0.23/version.desc b/packages/uClibc-ng/1.0.23/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/uClibc-ng/1.0.23/version.desc
diff --git a/packages/uClibc-ng/1.0.24/700-features.h-c11.patch b/packages/uClibc-ng/1.0.24/700-features.h-c11.patch
new file mode 100644
index 00000000..cb1d2a8e
--- /dev/null
+++ b/packages/uClibc-ng/1.0.24/700-features.h-c11.patch
@@ -0,0 +1,61 @@
+From 5b0f49037e8ea8500b05c8f31ee88529ccac4cee Mon Sep 17 00:00:00 2001
+From: Waldemar Brodkorb <wbx@openadk.org>
+Date: Sun, 7 May 2017 16:28:14 +0200
+Subject: sync features.h with GNU C library, fixes gcc 7.1 toolchain creation
+
+---
+ include/features.h | 17 ++++++++++++-----
+ 1 file changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/include/features.h b/include/features.h
+index e76bbba..f982079 100644
+--- a/include/features.h
++++ b/include/features.h
+@@ -55,6 +55,7 @@
+    These are defined by this file and are used by the
+    header files to decide what to declare or define:
+ 
++   __USE_ISOC11		Define ISO C11 things.
+    __USE_ISOC99		Define ISO C99 things.
+    __USE_ISOC95		Define ISO C90 AMD1 (C95) things.
+    __USE_POSIX		Define IEEE Std 1003.1 things.
+@@ -91,6 +92,7 @@
+ 
+ 
+ /* Undefine everything, so we get a clean slate.  */
++#undef	__USE_ISOC11
+ #undef	__USE_ISOC99
+ #undef	__USE_ISOC95
+ #undef	__USE_POSIX
+@@ -151,6 +153,8 @@
+ #ifdef _GNU_SOURCE
+ # undef  _ISOC99_SOURCE
+ # define _ISOC99_SOURCE	1
++# undef  _ISOC11_SOURCE
++# define _ISOC11_SOURCE	1
+ # undef  _POSIX_SOURCE
+ # define _POSIX_SOURCE	1
+ # undef  _POSIX_C_SOURCE
+@@ -223,11 +227,14 @@
+ # define _SVID_SOURCE	1
+ #endif
+ 
+-/* This is to enable the ISO C99 extension.  Also recognize the old macro
+-   which was used prior to the standard acceptance.  This macro will
+-   eventually go away and the features enabled by default once the ISO C99
+-   standard is widely adopted.  */
+-#if (defined _ISOC99_SOURCE || defined _ISOC9X_SOURCE \
++/* This is to enable the ISO C11 extension.  */
++#if (defined _ISOC11_SOURCE \
++     || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 201112L))
++# define __USE_ISOC11	1
++#endif
++
++/* This is to enable the ISO C99 extension.  */
++#if (defined _ISOC99_SOURCE || defined _ISOC11_SOURCE \
+      || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L))
+ # define __USE_ISOC99	1
+ #endif
+-- 
+cgit v0.11.2-3-g2eb4
+
diff --git a/packages/uClibc-ng/1.0.24/version.desc b/packages/uClibc-ng/1.0.24/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/uClibc-ng/1.0.24/version.desc
diff --git a/packages/uClibc-ng/1.0.25/version.desc b/packages/uClibc-ng/1.0.25/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/uClibc-ng/1.0.25/version.desc
diff --git a/packages/uClibc-ng/package.desc b/packages/uClibc-ng/package.desc
new file mode 100644
index 00000000..72cfd1a8
--- /dev/null
+++ b/packages/uClibc-ng/package.desc
@@ -0,0 +1,3 @@
+origin="uclibc-ng.org"
+repository="git git://uclibc-ng.org/git/uclibc-ng"
+milestones="0.9.33.2 1.0.0 1.0.15"