diff options
| -rw-r--r-- | packages/musl/1.1.21/chksum | 4 | ||||
| -rw-r--r-- | packages/musl/1.1.21/version.desc | 0 | ||||
| -rw-r--r-- | scripts/build/libc/uClibc.sh | 4 | ||||
| -rw-r--r-- | scripts/crosstool-NG.sh | 5 | ||||
| -rw-r--r-- | scripts/functions | 11 |
5 files changed, 20 insertions, 4 deletions
diff --git a/packages/musl/1.1.21/chksum b/packages/musl/1.1.21/chksum new file mode 100644 index 0000000..86423ed --- /dev/null +++ b/packages/musl/1.1.21/chksum @@ -0,0 +1,4 @@ +md5 musl-1.1.21.tar.gz 7fa82f223a9a10959162185fcedfcc7b +sha1 musl-1.1.21.tar.gz de45b38c1efcfe9a4847e7224345a8df2275e462 +sha256 musl-1.1.21.tar.gz c742b66f6f49c9e5f52f64d8b79fecb5a0f6e0203fca176c70ca20f6be285f44 +sha512 musl-1.1.21.tar.gz fa6c4cc012626c5e517e0e10926fc845e3aa5f863ffaceeb38ac5b9ce0af631a37f6b94f470997db09aa0d5e03f4f28a2db83484b0f98481bea2239c1989d363 diff --git a/packages/musl/1.1.21/version.desc b/packages/musl/1.1.21/version.desc new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/packages/musl/1.1.21/version.desc diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh index ccadfeb..5ea5c58 100644 --- a/scripts/build/libc/uClibc.sh +++ b/scripts/build/libc/uClibc.sh @@ -416,4 +416,8 @@ uClibc_post_cc() # Moreover, need to do this after the final compiler is built: on targets # that use elf2flt, the core compilers cannot find ld when running elf2flt. CT_MultilibFixupLDSO + + if [ -n "${CT_LIBC_UCLIBC_CONFIG_FILE}" ]; then + CT_InstallConfigurationFile "${CT_LIBC_UCLIBC_CONFIG_FILE}" libc + fi } diff --git a/scripts/crosstool-NG.sh b/scripts/crosstool-NG.sh index 3e888d7..9804a6c 100644 --- a/scripts/crosstool-NG.sh +++ b/scripts/crosstool-NG.sh @@ -613,10 +613,7 @@ if [ -z "${CT_RESTART}" ]; then rm -f "${testc}" CT_DoLog EXTRA "Installing user-supplied crosstool-NG configuration" - CT_DoExecLog ALL mkdir -p "${CT_PREFIX_DIR}/bin" - CT_DoExecLog DEBUG ${install} -m 0755 "${CT_LIB_DIR}/scripts/toolchain-config.in" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-ct-ng.config" - CT_DoExecLog DEBUG ${sed} -i -e 's,@@grep@@,"'"${grep}"'",;' "${CT_PREFIX_DIR}/bin/${CT_TARGET}-ct-ng.config" - bzip2 -c -9 .config >>"${CT_PREFIX_DIR}/bin/${CT_TARGET}-ct-ng.config" + CT_InstallConfigurationFile .config ct-ng CT_DoStep EXTRA "Dumping internal crosstool-NG configuration" CT_DoLog EXTRA "Building a toolchain for:" diff --git a/scripts/functions b/scripts/functions index c97b9f4..618298a 100644 --- a/scripts/functions +++ b/scripts/functions @@ -2453,3 +2453,14 @@ CT_InstallCopyingInformation() shopt -u nullglob } + +CT_InstallConfigurationFile() +{ + local path="${1}" + local suffix="${2}" + + CT_DoExecLog ALL mkdir -p "${CT_PREFIX_DIR}/bin" + CT_DoExecLog DEBUG ${install} -m 0755 "${CT_LIB_DIR}/scripts/toolchain-config.in" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${suffix}.config" + CT_DoExecLog DEBUG ${sed} -i -e 's,@@grep@@,"'"${grep}"'",;' "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${suffix}.config" + bzip2 -c -9 "${path}" >>"${CT_PREFIX_DIR}/bin/${CT_TARGET}-${suffix}.config" +} |