Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix building uClibc-ng from custom directory #492

Merged
merged 2 commits into from
Dec 3, 2016
Merged

Fix building uClibc-ng from custom directory #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51a3606
Fix use of custom location if it is a directory.
stilor Dec 2, 2016
289188e
uClibc-ng needs to know whether it is 1.0.15+
stilor Dec 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion config/libc/uClibc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/build/companion_libs/320-libiconv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion scripts/build/companion_libs/330-gettext.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/build/debug/200-duma.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion scripts/build/debug/400-ltrace.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion scripts/build/libc/avr-libc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion scripts/build/libc/uClibc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down