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

scripts/functions: change handling of nochdir

Browse Source 
- 'nochdir' must be the first option
- have systematic pushd/popd, even if nochdir
This commit is contained in:
Yann E. MORIN"
2010-01-12 19:24:03 +01:00
parent 5280cd71be
commit e3a4063ac6
6 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/build/libc/eglibc.sh
View File

@ -101,7 +101,7 @@ do_libc_extract() {
# NPTL addon is not to be extracted, in any case
[ "${addon}" = "nptl" ] && continue || true
CT_Pushd "${CT_SRC_DIR}/eglibc-${CT_LIBC_VERSION}"
CT_Extract "eglibc-${addon}-${CT_LIBC_VERSION}" nochdir
CT_Extract nochdir "eglibc-${addon}-${CT_LIBC_VERSION}"
# Some addons have the 'long' name, while others have the
# 'short' name, but patches are non-uniformly built with
# either the 'long' or 'short' name, whatever the addons name
@ -110,7 +110,7 @@ do_libc_extract() {
# directory, returns true!
[ -d "${addon}" ] || ln -s "eglibc-${addon}-${CT_LIBC_VERSION}" "${addon}"
[ -d "eglibc-${addon}-${CT_LIBC_VERSION}" ] || ln -s "${addon}" "eglibc-${addon}-${CT_LIBC_VERSION}"
CT_Patch "eglibc-${addon}-${CT_LIBC_VERSION}" nochdir
CT_Patch nochdir "eglibc-${addon}-${CT_LIBC_VERSION}"
CT_Popd
done

6
scripts/build/libc/glibc.sh
View File

@ -38,13 +38,13 @@ do_libc_extract() {
CT_Extract "glibc-${CT_LIBC_VERSION}"
CT_Pushd "${CT_SRC_DIR}/glibc-${CT_LIBC_VERSION}"
CT_Patch "glibc-${CT_LIBC_VERSION}" nochdir
CT_Patch nochdir "glibc-${CT_LIBC_VERSION}"
# C library addons
for addon in "${addons_list[@]}"; do
# NPTL addon is not to be extracted, in any case
[ "${addon}" = "nptl" ] && continue || true
CT_Extract "glibc-${addon}-${CT_LIBC_VERSION}" nochdir
CT_Extract nochdir "glibc-${addon}-${CT_LIBC_VERSION}"
# Some addons have the 'long' name, while others have the
# 'short' name, but patches are non-uniformly built with
@ -54,7 +54,7 @@ do_libc_extract() {
# directory, returns true!
[ -d "${addon}" ] || CT_DoExecLog ALL ln -s "glibc-${addon}-${CT_LIBC_VERSION}" "${addon}"
[ -d "glibc-${addon}-${CT_LIBC_VERSION}" ] || CT_DoExecLog ALL ln -s "${addon}" "glibc-${addon}-${CT_LIBC_VERSION}"
CT_Patch "glibc-${addon}-${CT_LIBC_VERSION}" nochdir
CT_Patch nochdir "glibc-${addon}-${CT_LIBC_VERSION}"
done
# The configure files may be older than the configure.in files

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

@ -27,8 +27,8 @@ do_libc_extract() {
# uClibc locales
if [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ]; then
CT_Pushd "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}/extra/locale"
CT_Extract "uClibc-locale-030818" nochdir
CT_Patch "uClibc-locale-030818" nochdir
CT_Extract nochdir "uClibc-locale-030818"
CT_Patch nochdir "uClibc-locale-030818"
CT_Popd
fi