diff options
author | Alexey Neyman <stilor@att.net> | 2016-12-03 03:18:46 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-03 03:18:46 (GMT) |
commit | a787e410dc7133fb371e71161663639e1c0dc89b (patch) | |
tree | 1fba1e4a9fc60a49986971608ca1282e3246fd6f | |
parent | f7f70b67c44727d9eea48997c837e87c5e63ca33 (diff) | |
parent | 289188e6f2b55382fa508fed39385c49c5bb9c7c (diff) |
Merge pull request #492 from stilor/custom-loc
Fix building uClibc-ng from custom directory
-rw-r--r-- | config/libc/uClibc.in | 6 | ||||
-rw-r--r-- | scripts/build/companion_libs/320-libiconv.sh | 2 | ||||
-rw-r--r-- | scripts/build/companion_libs/330-gettext.sh | 2 | ||||
-rw-r--r-- | scripts/build/debug/200-duma.sh | 2 | ||||
-rw-r--r-- | scripts/build/debug/400-ltrace.sh | 2 | ||||
-rw-r--r-- | scripts/build/libc/avr-libc.sh | 2 | ||||
-rw-r--r-- | scripts/build/libc/uClibc.sh | 2 |
7 files changed, 11 insertions, 7 deletions
diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in index 7e44381..a359fe6 100644 --- a/config/libc/uClibc.in +++ b/config/libc/uClibc.in @@ -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 diff --git a/scripts/build/companion_libs/320-libiconv.sh b/scripts/build/companion_libs/320-libiconv.sh index 2f1b209..ffe60c2 100644 --- a/scripts/build/companion_libs/320-libiconv.sh +++ b/scripts/build/companion_libs/320-libiconv.sh @@ -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") diff --git a/scripts/build/companion_libs/330-gettext.sh b/scripts/build/companion_libs/330-gettext.sh index 6be51bf..19d3ca8 100644 --- a/scripts/build/companion_libs/330-gettext.sh +++ b/scripts/build/companion_libs/330-gettext.sh @@ -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 diff --git a/scripts/build/debug/200-duma.sh b/scripts/build/debug/200-duma.sh index a84366c..0e5291c 100644 --- a/scripts/build/debug/200-duma.sh +++ b/scripts/build/debug/200-duma.sh @@ -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= diff --git a/scripts/build/debug/400-ltrace.sh b/scripts/build/debug/400-ltrace.sh index 56f2580..fdf1e40 100644 --- a/scripts/build/debug/400-ltrace.sh +++ b/scripts/build/debug/400-ltrace.sh @@ -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" diff --git a/scripts/build/libc/avr-libc.sh b/scripts/build/libc/avr-libc.sh index ff16cf9..431e876 100644 --- a/scripts/build/libc/avr-libc.sh +++ b/scripts/build/libc/avr-libc.sh @@ -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" diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh index 2f25e27..96d4b51 100644 --- a/scripts/build/libc/uClibc.sh +++ b/scripts/build/libc/uClibc.sh @@ -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}" |