From 5324905c1446d898d9a8f578555c1e54a2fbc89c Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Fri, 25 Aug 2017 08:42:19 -0700
Subject: Fix glibc-ports with the new framework

While here, also consider patched by anything other than "bundled patches"
as per-target sources. Add scary warnings in case of a failure.

Signed-off-by: Alexey Neyman <stilor@att.net>
---
 config/global/extract.in | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'config')

diff --git a/config/global/extract.in b/config/global/extract.in
index 582e69c2..58f7b956 100644
--- a/config/global/extract.in
+++ b/config/global/extract.in
@@ -52,30 +52,36 @@ config PATCH_BUNDLED
 
 config PATCH_LOCAL
     bool
-    prompt "Local only"
+    prompt "Local only (EXPERIMENTAL)"
     select PATCH_USE_LOCAL
+    depends on EXPERIMENTAL
     help
-      Only apply your local patches.
+      Only apply your local patches. Many components require patching
+      to build or work properly; please review the bundled patches and
+      copy them into your local directory if needed.
 
 config PATCH_BUNDLED_LOCAL
     bool
     prompt "Bundled, then local"
     select PATCH_USE_LOCAL
     help
-      Apply the patches bundled with crosstool-NG,
-      then apply your local patches.
+      Apply the patches bundled with crosstool-NG, then apply your local
+      patches.
 
 config PATCH_LOCAL_BUNDLED
     bool
     prompt "Local, then bundled"
     select PATCH_USE_LOCAL
+    depends on EXPERIMENTAL
     help
-      Apply your local patches, then apply the patches
-      bundled with crosstool-NG.
+      Apply your local patches, then apply the patches bundled with
+      crosstool-NG. Note that the bundled patches cannot be guaranteed
+      to apply on top of your local patches.
 
 config PATCH_NONE
     bool
     prompt "None"
+    depends on EXPERIMENTAL
     help
       Don't use any patch at all.
       
-- 
cgit v1.2.3


From eba1a826862d875e6163315029839fd3de192c8b Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Sat, 26 Aug 2017 12:40:10 -0700
Subject: Make --enable-obsolete-rpc an option in ct-ng

Signed-off-by: Alexey Neyman <stilor@att.net>
---
 config/libc/glibc.in        | 16 ++++++++++++++++
 packages/glibc/package.desc |  2 +-
 scripts/build/libc/glibc.sh |  5 +++--
 3 files changed, 20 insertions(+), 3 deletions(-)

(limited to 'config')

diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index f6791301..ee90884c 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -90,6 +90,15 @@ config GLIBC_NO_SPARC_V8
     def_bool y
     depends on GLIBC_2_23_or_later
 
+# 2.14 obsoleted Sun RPC code, making it unavailable *at all* for compiling/linking
+# (only remained as versioned symbols for previously linked binaries). They backpedaled
+# in 2.16, adding an option to enable that code. Crosstool-NG backports that code
+# to 2.14/2.15, but there is no harm in throwing this option even if that patch
+# is not applied.
+config GLIBC_HAS_OBSOLETE_RPC
+    def_bool y
+    depends on GLIBC_2_14_or_later
+
 config GLIBC_EXTRA_CONFIG_ARRAY
     string
     prompt "extra config"
@@ -123,6 +132,13 @@ config GLIBC_EXTRA_CFLAGS
     help
       Extra target CFLAGS to use when building.
 
+config GLIBC_ENABLE_OBSOLETE_RPC
+    bool "Enable obsolete (Sun) RPC"
+    default y
+    depends on GLIBC_HAS_OBSOLETE_RPC
+    help
+      Allow building applications using obsolete (Sun) RPC.
+
 config GLIBC_ENABLE_FORTIFIED_BUILD
     bool
     prompt "Enable fortified build (EXPERIMENTAL)"
diff --git a/packages/glibc/package.desc b/packages/glibc/package.desc
index f94055a7..4ee3938a 100644
--- a/packages/glibc/package.desc
+++ b/packages/glibc/package.desc
@@ -1,5 +1,5 @@
 origin='GNU'
 repository='git git://sourceware.org/git/glibc.git'
 mirrors='$(CT_Mirrors GNU glibc)'
-milestones='2.17 2.20 2.23 2.24'
+milestones='2.14 2.17 2.20 2.23 2.24'
 archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh
index 84bfeed8..c09ff5cd 100644
--- a/scripts/build/libc/glibc.sh
+++ b/scripts/build/libc/glibc.sh
@@ -128,8 +128,9 @@ do_libc_backend_once() {
     # Also, if those two are missing, iconv build breaks
     extra_config+=( --disable-debug --disable-sanity-checks )
 
-    # always include rpc, the user can still override it with TI-RPC
-    extra_config+=( --enable-obsolete-rpc )
+    if [ "${CT_GLIBC_ENABLE_OBSOLETE_RPC}" = "y" ]; then
+        extra_config+=( --enable-obsolete-rpc )
+    fi
 
     # Add some default glibc config options if not given by user.
     # We don't need to be conditional on whether the user did set different
-- 
cgit v1.2.3