ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-06-17 06:48:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes for building

Browse Source 
- 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>
This commit is contained in:
Alexey Neyman
2017-07-01 20:17:56 -07:00
parent b155ce6ab8
commit d0ff020e23
18 changed files with 41 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/functions
View File

@ -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