Fixes for building

- Need GDB8.0 milestone
- Make uClibc "master" package
- Rename bionic -> android-ndk to match the package name and
  support suffixes for archives

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

3 files changed, 15 insertions, 16 deletions

diff --git a/scripts/build/libc/bionic.sh b/scripts/build/libc/bionic.sh
index a52078d0..027493d4 100644
--- a/scripts/build/libc/bionic.sh
+++ b/scripts/build/libc/bionic.sh
@@ -3,17 +3,17 @@
 # Licensed under the GPL v2. See COPYING in the root of this package
 
 do_libc_get() {
-    CT_Fetch BIONIC
+    CT_Fetch ANDROID_NDK
 }
 
 do_libc_extract() {
-    CT_ExtractPatch BIONIC
+    CT_ExtractPatch ANDROID_NDK
 }
 
 # Install Unified headers
 do_libc_start_files() {
     CT_DoStep INFO "Installing C library headers"
-    CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/bionic/sysroot/usr" "${CT_SYSROOT_DIR}"
+    CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/android-ndk/sysroot/usr" "${CT_SYSROOT_DIR}"
 }
 
 do_libc() {
@@ -25,7 +25,7 @@ do_libc() {
         arch="${arch}64"
     fi
     CT_DoStep INFO "Installing C library binaries"
-    CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/bionic/platforms/android-${CT_ANDROID_API}/arch-${arch}/usr" "${CT_SYSROOT_DIR}"
+    CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/android-ndk/platforms/android-${CT_ANDROID_API}/arch-${arch}/usr" "${CT_SYSROOT_DIR}"
     CT_EnvModify CT_TARGET_CFLAGS "${CT_TARGET_CFLAGS} -D__ANDROID_API__=${CT_ANDROID_API}"
 }
 
diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh
index e428349a..1e6db21b 100644
--- a/scripts/build/libc/uClibc.sh
+++ b/scripts/build/libc/uClibc.sh
@@ -7,16 +7,15 @@
 uclibc_locales_version=030818
 uclibc_locale_tarball="uClibc-locale-${uclibc_locales_version}"
 
-if [ "${CT_UCLIBC_NG_USE_UCLIBC_NG_ORG}" = "y" ]; then
+if [ "${CT_UCLIBC_USE_UCLIBC_NG_ORG}" = "y" ]; then
     # TBD make the name come from config/versions/uclibc.in
     uclibc_name="uClibc-ng"
-elif [ "${CT_UCLIBC_NG_USE_UCLIBC_ORG}" = "y" ]; then
+elif [ "${CT_UCLIBC_USE_UCLIBC_ORG}" = "y" ]; then
     uclibc_name="uClibc"
 fi
 
 # Download uClibc
 do_libc_get() {
-    # TBD allow for "default fork" selection in package.desc and select uClibc-NG (and then use just UCLIBC moniker)
     CT_Fetch UCLIBC_NG
     # TBD locales
 }
diff --git a/scripts/functions b/scripts/functions
index 24cc6679..e3c04efd 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -1688,7 +1688,7 @@ CT_PackageRun()
     use="${use:-${sym}}"
 
     # Variables that are per-fork
-    for v in basename pkg_name version src_release mirrors src_devel src_custom \
+    for v in basename pkg_name version src_release mirrors archive_suffix src_devel src_custom \
             devel_vcs devel_url devel_branch devel_revision devel_subdir devel_bootstrap \
             custom_location; do
         eval "local ${v}=\${CT_${use}_${v^^}}"
@@ -1711,7 +1711,7 @@ CT_DoFetch()
 
     if [ "${src_release}" = "y" ]; then
         basename="${pkg_name}-${version}"
-        if ! CT_GetFile "${basename}" ${mirrors}; then
+        if ! CT_GetFile "${basename}${archive_suffix}" ${mirrors}; then
             CT_Abort "${pkg_name}: download failed"
         fi
 
@@ -1798,19 +1798,19 @@ CT_Extract()
     CT_DoExecLog ALL mkdir -p "${dir}"
     case "${file}" in
         *.tar.xz)
-            xz -fdc "${file}" | CT_DoExecLog FILE tar x -f - -C "${dir}" ${components}
+            xz -fdc "${file}" | CT_DoExecLog FILE tar x -v -f - -C "${dir}" ${components}
             ;;
         *.tar.lzma)
-            xz -fdc "${file}" | CT_DoExecLog FILE tar x -f - -C "${dir}" ${components}
+            xz -fdc "${file}" | CT_DoExecLog FILE tar x -v -f - -C "${dir}" ${components}
             ;;
         *.tar.bz2)
-            bzip2 -dc "${file}" | CT_DoExecLog FILE tar x -f - -C "${dir}" ${components}
+            bzip2 -dc "${file}" | CT_DoExecLog FILE tar x -v -f - -C "${dir}" ${components}
             ;;
         *.tar.gz|*.tgz)
-            gzip -dc "${file}" | CT_DoExecLog FILE tar x -f - -C "${dir}" ${components}
+            gzip -dc "${file}" | CT_DoExecLog FILE tar x -v -f - -C "${dir}" ${components}
             ;;
         *.tar)
-            CT_DoExecLog FILE tar x -f "${file}" -C "${dir}" ${components}
+            CT_DoExecLog FILE tar x -v -f "${file}" -C "${dir}" ${components}
             ;;
         *.zip)
             CT_Pushd "${dir}"
@@ -1855,8 +1855,8 @@ CT_DoExtractPatch()
             CT_DoLog EXTRA "Extracting ${basename}"
             CT_DoExecLog ALL touch "${CT_COMMON_SRC_DIR}/.${basename}.extracting"
             # TBD save/discover the extension while fetching
-            ext=`CT_GetFileExtension "${basename}"`
-            CT_Extract "${CT_TARBALLS_DIR}/${basename}${ext}" "${CT_COMMON_SRC_DIR}"
+            ext=`CT_GetFileExtension "${basename}${archive_suffix}"`
+            CT_Extract "${CT_TARBALLS_DIR}/${basename}${archive_suffix}${ext}" "${CT_COMMON_SRC_DIR}"
             CT_DoExecLog ALL touch "${CT_COMMON_SRC_DIR}/.${basename}.extracted"
             CT_DoExecLog ALL rm -f "${CT_COMMON_SRC_DIR}/.${basename}.extracting"
         fi