From 5e0b489b123e7a1a3f8ec6d41eac3b395f5c92f9 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Tue, 7 Feb 2017 16:46:23 -0800
Subject: External addons supported by glibc even now

... though none are provided by default.

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

diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh
index f6e46c6..348c35a 100644
--- a/scripts/build/libc/glibc.sh
+++ b/scripts/build/libc/glibc.sh
@@ -66,39 +66,36 @@ do_libc_extract() {
     # marks custom glibc as patched.
     CT_Patch nochdir "${CT_LIBC}" "${CT_LIBC_VERSION}"
 
-    # Extract the add-opns if => 2.17
-    if [ "${CT_LIBC_GLIBC_2_17_or_later}" != "y" ]; then
-        for addon in $(do_libc_add_ons_list " "); do
-            # If the addon was bundled with the main archive, we do not
-            # need to extract it. Worse, if we were to try to extract
-            # it, we'd get an error.
-            if [ -d "${addon}" ]; then
-                CT_DoLog DEBUG "Add-on '${addon}' already present, skipping extraction"
-                continue
-            fi
+    for addon in $(do_libc_add_ons_list " "); do
+        # If the addon was bundled with the main archive, we do not
+        # need to extract it. Worse, if we were to try to extract
+        # it, we'd get an error.
+        if [ -d "${addon}" ]; then
+            CT_DoLog DEBUG "Add-on '${addon}' already present, skipping extraction"
+            continue
+        fi
 
-            CT_Extract nochdir "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}"
+        CT_Extract nochdir "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}"
 
-            CT_TestAndAbort "Error in add-on '${addon}': both short and long names in tarball" \
-                -d "${addon}" -a -d "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}"
+        CT_TestAndAbort "Error in add-on '${addon}': both short and long names in tarball" \
+            -d "${addon}" -a -d "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}"
 
-            # Some addons have the 'long' name, while others have the
-            # 'short' name, but patches are non-uniformly built with
-            # either the 'long' or 'short' name, whatever the addons name
-            # but we prefer the 'short' name and avoid duplicates.
-            if [ -d "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" ]; then
-                CT_DoExecLog FILE mv "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" "${addon}"
-            fi
+        # Some addons have the 'long' name, while others have the
+        # 'short' name, but patches are non-uniformly built with
+        # either the 'long' or 'short' name, whatever the addons name
+        # but we prefer the 'short' name and avoid duplicates.
+        if [ -d "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" ]; then
+            CT_DoExecLog FILE mv "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" "${addon}"
+        fi
 
-            CT_DoExecLog FILE ln -s "${addon}" "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}"
+        CT_DoExecLog FILE ln -s "${addon}" "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}"
 
-            CT_Patch nochdir "${CT_LIBC}" "${addon}-${CT_LIBC_VERSION}"
+        CT_Patch nochdir "${CT_LIBC}" "${addon}-${CT_LIBC_VERSION}"
 
-            # Remove the long name since it can confuse configure scripts to run
-            # the same source twice.
-            rm "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}"
-        done
-    fi
+        # Remove the long name since it can confuse configure scripts to run
+        # the same source twice.
+        rm "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}"
+    done
 
     # The configure files may be older than the configure.in files
     # if using a snapshot (or even some tarballs). Fake them being
-- 
cgit v0.10.2-6-g49f6