ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2024-12-19 12:57:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #492 from stilor/custom-loc

Browse Source 
Fix building uClibc-ng from custom directory
This commit is contained in:
Alexey Neyman 2016-12-02 19:18:46 -08:00 committed by GitHub
commit a787e410dc
7 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/libc/uClibc.in
View File

@ -39,7 +39,11 @@ config LIBC_UCLIBC_CUSTOM_UCLIBC
select LIBC_UCLIBC_0_9_33_2_or_later
config LIBC_UCLIBC_CUSTOM_UCLIBC_NG
bool "uClibc-ng"
bool "uClibc-ng (1.0.15 or later)"
select LIBC_UCLIBC_NG_1_0_15_or_later
config LIBC_UCLIBC_CUSTOM_UCLIBC_NG_OLD
bool "uClibc-ng (older than 1.0.15)"
select LIBC_UCLIBC_NG_1_0_0_or_later
endchoice

2
scripts/build/companion_libs/320-libiconv.sh
View File

@ -88,7 +88,7 @@ do_libiconv_backend() {
CT_DoLog EXTRA "Configuring libiconv"
CT_DoExecLog ALL cp -aT "${CT_SRC_DIR}/libiconv-${CT_LIBICONV_VERSION}" "."
CT_DoExecLog ALL cp -aT "${CT_SRC_DIR}/libiconv-${CT_LIBICONV_VERSION}/." "."
if [ "${static_build}" = "y" ]; then
extra_config+=("--disable-shared")

2
scripts/build/companion_libs/330-gettext.sh
View File

@ -88,7 +88,7 @@ do_gettext_backend() {
CT_DoLog EXTRA "Configuring gettext"
CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/gettext-${CT_GETTEXT_VERSION}/"/* .
CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/gettext-${CT_GETTEXT_VERSION}/." .
# A bit ugly. D__USE_MINGW_ANSI_STDIO=1 has its own {v}asprintf functions
# but gettext configure doesn't see this flag when it checks for that. An

2
scripts/build/debug/200-duma.sh
View File

@ -24,7 +24,7 @@ do_debug_duma_extract() {
do_debug_duma_build() {
CT_DoStep INFO "Installing D.U.M.A."
CT_DoLog EXTRA "Copying sources"
cp -a "${CT_SRC_DIR}/duma_${CT_DUMA_VERSION}" "${CT_BUILD_DIR}/build-duma"
cp -a "${CT_SRC_DIR}/duma_${CT_DUMA_VERSION}/." "${CT_BUILD_DIR}/build-duma"
CT_Pushd "${CT_BUILD_DIR}/build-duma"
DUMA_CPP=

2
scripts/build/debug/400-ltrace.sh
View File

@ -22,7 +22,7 @@ do_debug_ltrace_build() {
CT_DoStep INFO "Installing ltrace"
CT_DoLog EXTRA "Copying sources to build dir"
CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/ltrace-${CT_LTRACE_VERSION}" \
CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/ltrace-${CT_LTRACE_VERSION}/." \
"${CT_BUILD_DIR}/build-ltrace"
CT_Pushd "${CT_BUILD_DIR}/build-ltrace"

2
scripts/build/libc/avr-libc.sh
View File

@ -41,7 +41,7 @@ do_libc_post_cc() {
CT_DoStep INFO "Installing C library"
CT_DoLog EXTRA "Copying sources to build directory"
CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/avr-libc-${CT_LIBC_VERSION}" \
CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/avr-libc-${CT_LIBC_VERSION}/." \
"${CT_BUILD_DIR}/build-libc-post-cc"
cd "${CT_BUILD_DIR}/build-libc-post-cc"

2
scripts/build/libc/uClibc.sh
View File

@ -104,7 +104,7 @@ do_libc_backend_once() {
# Simply copy files until uClibc has the ability to build out-of-tree
CT_DoLog EXTRA "Copying sources to build dir"
CT_DoExecLog ALL cp -aT "${CT_SRC_DIR}/${uclibc_name}-${CT_LIBC_VERSION}" .
CT_DoExecLog ALL cp -aT "${CT_SRC_DIR}/${uclibc_name}-${CT_LIBC_VERSION}/." .
multilib_dir="lib/${multi_os_dir}"
startfiles_dir="${multi_root}/usr/${multilib_dir}"