3 files changed, 33 insertions, 8 deletions

diff --git a/scripts/build/libc/eglibc.sh b/scripts/build/libc/eglibc.sh
index 1d5608ad..478a230e 100644
--- a/scripts/build/libc/eglibc.sh
+++ b/scripts/build/libc/eglibc.sh
@@ -92,14 +92,24 @@ do_libc_get() {
 
 # Extract eglibc
 do_libc_extract() {
-    CT_ExtractAndPatch "eglibc-${CT_LIBC_VERSION}"
+    CT_Extract "eglibc-${CT_LIBC_VERSION}"
+    CT_Patch "eglibc-${CT_LIBC_VERSION}"
 
     # C library addons
     for addon in $(do_libc_add_ons_list " "); do
         # NPTL addon is not to be extracted, in any case
         [ "${addon}" = "nptl" ] && continue || true
         CT_Pushd "${CT_SRC_DIR}/eglibc-${CT_LIBC_VERSION}"
-        CT_ExtractAndPatch "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" nochdir
+        CT_Extract "eglibc-${addon}-${CT_LIBC_VERSION}" nochdir
+        # 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
+        # so we have to make symlinks from the existing to the missing
+        # Fortunately for us, [ -d foo ], when foo is a symlink to a
+        # directory, returns true!
+        [ -d "${addon}" ] || ln -s "eglibc-${addon}-${CT_LIBC_VERSION}" "${addon}"
+        [ -d "eglibc-${addon}-${CT_LIBC_VERSION}" ] || ln -s "${addon}" "eglibc-${addon}-${CT_LIBC_VERSION}"
+        CT_Patch "eglibc-${addon}-${CT_LIBC_VERSION}" nochdir
         CT_Popd
     done
 
diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh
index 146a5b2c..b56905ea 100644
--- a/scripts/build/libc/glibc.sh
+++ b/scripts/build/libc/glibc.sh
@@ -55,14 +55,24 @@ do_libc_get() {
 
 # Extract glibc
 do_libc_extract() {
-    CT_ExtractAndPatch "glibc-${CT_LIBC_VERSION}"
+    CT_Extract "glibc-${CT_LIBC_VERSION}"
+    CT_Patch "glibc-${CT_LIBC_VERSION}"
 
     # C library addons
     for addon in $(do_libc_add_ons_list " "); do
         # NPTL addon is not to be extracted, in any case
         [ "${addon}" = "nptl" ] && continue || true
         CT_Pushd "${CT_SRC_DIR}/glibc-${CT_LIBC_VERSION}"
-        CT_ExtractAndPatch "glibc-${addon}-${CT_LIBC_VERSION}" nochdir
+        CT_Extract "glibc-${addon}-${CT_LIBC_VERSION}" nochdir
+        # 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
+        # so we have to make symlinks from the existing to the missing
+        # Fortunately for us, [ -d foo ], when foo is a symlink to a
+        # directory, returns true!
+        [ -d "${addon}" ] || ln -s "glibc-${addon}-${CT_LIBC_VERSION}" "${addon}"
+        [ -d "glibc-${addon}-${CT_LIBC_VERSION}" ] || ln -s "${addon}" "glibc-${addon}-${CT_LIBC_VERSION}"
+        CT_Patch "glibc-${addon}-${CT_LIBC_VERSION}" nochdir
         CT_Popd
     done
 
diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh
index cf1623e4..e2345ed1 100644
--- a/scripts/build/libc/uClibc.sh
+++ b/scripts/build/libc/uClibc.sh
@@ -12,18 +12,23 @@ do_libc_get() {
     # later...
     CT_GetFile "uClibc-${CT_LIBC_VERSION}" ${libc_src}
     # uClibc locales
-    [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && CT_GetFile "uClibc-locale-030818" ${libc_src} || true
+    if [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ]; then
+        CT_GetFile "uClibc-locale-030818" ${libc_src}
+    fi
 
     return 0
 }
 
 # Extract uClibc
 do_libc_extract() {
-    CT_ExtractAndPatch "uClibc-${CT_LIBC_VERSION}"
+    CT_Extract "uClibc-${CT_LIBC_VERSION}"
+    CT_Patch "uClibc-${CT_LIBC_VERSION}"
+
     # uClibc locales
     if [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ]; then
-        CT_Pushd "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}"
-        CT_ExtractAndPatch "uClibc-locale-030818" nochdir || true
+        CT_Pushd "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}/extra/locale"
+        CT_Extract "uClibc-locale-030818" nochdir
+        CT_Patch "uClibc-locale-030818" nochdir
         CT_Popd
     fi