summaryrefslogtreecommitdiff
path: root/scripts/build
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2010-01-12 18:24:03 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2010-01-12 18:24:03 (GMT)
commite3a4063ac61b336d96e4c43589e43ab42f9991b6 (patch)
tree5693326f9d6e08b7f025fac7a748fc0f738e0be0 /scripts/build
parent5280cd71beeedfff4d980487e91455405de4e1d2 (diff)
scripts/functions: change handling of nochdir
- 'nochdir' must be the first option - have systematic pushd/popd, even if nochdir
Diffstat (limited to 'scripts/build')
-rw-r--r--scripts/build/companion_libs/cloog.sh2
-rw-r--r--scripts/build/debug/200-duma.sh2
-rw-r--r--scripts/build/libc/eglibc.sh4
-rw-r--r--scripts/build/libc/glibc.sh6
-rw-r--r--scripts/build/libc/uClibc.sh4
5 files changed, 9 insertions, 9 deletions
diff --git a/scripts/build/companion_libs/cloog.sh b/scripts/build/companion_libs/cloog.sh
index f6eb68a..bfba0f9 100644
--- a/scripts/build/companion_libs/cloog.sh
+++ b/scripts/build/companion_libs/cloog.sh
@@ -29,7 +29,7 @@ do_cloog_extract() {
*) _t="-${CT_CLOOG_VERSION}";;
esac
CT_Pushd "${CT_SRC_DIR}/cloog-ppl${_t}"
- CT_Patch "cloog-ppl-${CT_CLOOG_VERSION}" nochdir
+ CT_Patch nochdir "cloog-ppl-${CT_CLOOG_VERSION}"
CT_Popd
}
diff --git a/scripts/build/debug/200-duma.sh b/scripts/build/debug/200-duma.sh
index 225d00c..de0c5c1 100644
--- a/scripts/build/debug/200-duma.sh
+++ b/scripts/build/debug/200-duma.sh
@@ -16,7 +16,7 @@ do_debug_duma_extract() {
# name from the version in order to find the appropriate patches
# YEM: FIXME: make CT_Patch more intelligent, Eg.: CT_Patch duma _ "${CT_DUMA_VERSION}"
CT_DoExecLog DEBUG touch "${CT_SRC_DIR}/.duma-${CT_DUMA_VERSION}.extracted"
- CT_Patch "duma-${CT_DUMA_VERSION}" nochdir
+ CT_Patch nochdir "duma-${CT_DUMA_VERSION}"
CT_Popd
}
diff --git a/scripts/build/libc/eglibc.sh b/scripts/build/libc/eglibc.sh
index bea789f..b36201c 100644
--- a/scripts/build/libc/eglibc.sh
+++ b/scripts/build/libc/eglibc.sh
@@ -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
diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh
index c77cfee..c6a5dc1 100644
--- a/scripts/build/libc/glibc.sh
+++ b/scripts/build/libc/glibc.sh
@@ -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
diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh
index 0d4775e..009fd14 100644
--- a/scripts/build/libc/uClibc.sh
+++ b/scripts/build/libc/uClibc.sh
@@ -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