From 30dc7e94c998a4977e06bdf9e500b6e7fcabfaf8 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Mon, 23 Jan 2017 14:26:19 -0800
Subject: Add UCLIBC_HAS_LFS as always-enabled.

Buildroot checks for this feature.

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

diff --git a/patches/uClibc-ng/1.0.20/110-has-lfs.patch b/patches/uClibc-ng/1.0.20/110-has-lfs.patch
new file mode 100644
index 0000000..c5b90de
--- /dev/null
+++ b/patches/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/patches/uClibc-ng/1.0.21/110-has-lfs.patch b/patches/uClibc-ng/1.0.21/110-has-lfs.patch
new file mode 100644
index 0000000..c5b90de
--- /dev/null
+++ b/patches/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
+
-- 
cgit v0.10.2-6-g49f6


From aa24e9d913fc9385538ed6d493c094b33ef4d356 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Mon, 23 Jan 2017 14:37:18 -0800
Subject: Add selection for RPC

So that uClibc config can be matched to Buildroot's expectations via
the menu, without the need for a saved config.

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

diff --git a/config/libc/uClibc.in.2 b/config/libc/uClibc.in.2
index dc02420..7ac8a44 100644
--- a/config/libc/uClibc.in.2
+++ b/config/libc/uClibc.in.2
@@ -89,3 +89,9 @@ config LIBC_UCLIBC_FENV
 
       If you need fenv.h on other architectures, say 'y' here, but you may
       encounter some issues.
+
+config LIBC_UCLIBC_RPC
+    bool
+    prompt "Add support for RPC"
+    help
+      Enable support for remote procedure calls (RPC) in uClibc.
diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh
index d86ae1a..e58912c 100644
--- a/scripts/build/libc/uClibc.sh
+++ b/scripts/build/libc/uClibc.sh
@@ -299,6 +299,13 @@ manage_uClibc_config() {
     esac
     if [ "${CT_LIBC_UCLIBC_FENV}" = "y" ]; then
         CT_KconfigEnableOption "UCLIBC_HAS_FENV" "${dst}"
+    else
+        CT_KconfigDisableOption "UCLIBC_HAS_FENV" "${dst}"
+    fi
+    if [ "${CT_LIBC_UCLIBC_RPC}" = "y" ]; then
+        CT_KconfigEnableOption "UCLIBC_HAS_RPC" "${dst}"
+    else
+        CT_KconfigDisableOption "UCLIBC_HAS_RPC" "${dst}"
     fi
 
     # We always want ctor/dtor
-- 
cgit v0.10.2-6-g49f6