1.1 --- a/samples/arm-unknown-linux-uclibc/crosstool.config Sun Sep 13 18:44:17 2009 +0200
1.2 +++ b/samples/arm-unknown-linux-uclibc/crosstool.config Sun Sep 13 18:59:36 2009 +0200
1.3 @@ -326,7 +326,7 @@
1.4 # CT_LIBC_UCLIBC_DEBUG_LEVEL_2 is not set
1.5 CT_LIBC_UCLIBC_DEBUG_LEVEL=0
1.6 CT_LIBC_UCLIBC_BUILD_CROSS_LDD=y
1.7 -CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/${samp_dir}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
1.8 +CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
1.9 # CT_LIBC_UCLIBC_LOCALES is not set
1.10
1.11 #
2.1 --- a/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config Sun Sep 13 18:44:17 2009 +0200
2.2 +++ b/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config Sun Sep 13 18:59:36 2009 +0200
2.3 @@ -324,7 +324,7 @@
2.4 # CT_LIBC_UCLIBC_DEBUG_LEVEL_2 is not set
2.5 CT_LIBC_UCLIBC_DEBUG_LEVEL=0
2.6 CT_LIBC_UCLIBC_BUILD_CROSS_LDD=y
2.7 -CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/${samp_dir}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
2.8 +CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
2.9 # CT_LIBC_UCLIBC_LOCALES is not set
2.10
2.11 #
3.1 --- a/samples/armeb-unknown-linux-uclibc/crosstool.config Sun Sep 13 18:44:17 2009 +0200
3.2 +++ b/samples/armeb-unknown-linux-uclibc/crosstool.config Sun Sep 13 18:59:36 2009 +0200
3.3 @@ -325,7 +325,7 @@
3.4 # CT_LIBC_UCLIBC_DEBUG_LEVEL_2 is not set
3.5 CT_LIBC_UCLIBC_DEBUG_LEVEL=0
3.6 CT_LIBC_UCLIBC_BUILD_CROSS_LDD=y
3.7 -CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/${samp_dir}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
3.8 +CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
3.9 # CT_LIBC_UCLIBC_LOCALES is not set
3.10
3.11 #
4.1 --- a/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config Sun Sep 13 18:44:17 2009 +0200
4.2 +++ b/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config Sun Sep 13 18:59:36 2009 +0200
4.3 @@ -324,7 +324,7 @@
4.4 # CT_LIBC_UCLIBC_DEBUG_LEVEL_2 is not set
4.5 CT_LIBC_UCLIBC_DEBUG_LEVEL=0
4.6 CT_LIBC_UCLIBC_BUILD_CROSS_LDD=y
4.7 -CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/${samp_dir}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
4.8 +CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
4.9 # CT_LIBC_UCLIBC_LOCALES is not set
4.10
4.11 #
5.1 --- a/samples/i586-geode-linux-uclibc/crosstool.config Sun Sep 13 18:44:17 2009 +0200
5.2 +++ b/samples/i586-geode-linux-uclibc/crosstool.config Sun Sep 13 18:59:36 2009 +0200
5.3 @@ -320,7 +320,7 @@
5.4 # CT_LIBC_UCLIBC_DEBUG_LEVEL_2 is not set
5.5 CT_LIBC_UCLIBC_DEBUG_LEVEL=0
5.6 CT_LIBC_UCLIBC_BUILD_CROSS_LDD=y
5.7 -CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/${samp_dir}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
5.8 +CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
5.9 # CT_LIBC_UCLIBC_LOCALES is not set
5.10
5.11 #
6.1 --- a/samples/mips-unknown-linux-uclibc/crosstool.config Sun Sep 13 18:44:17 2009 +0200
6.2 +++ b/samples/mips-unknown-linux-uclibc/crosstool.config Sun Sep 13 18:59:36 2009 +0200
6.3 @@ -321,7 +321,7 @@
6.4 # CT_LIBC_UCLIBC_DEBUG_LEVEL_2 is not set
6.5 CT_LIBC_UCLIBC_DEBUG_LEVEL=0
6.6 CT_LIBC_UCLIBC_BUILD_CROSS_LDD=y
6.7 -CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/${samp_dir}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
6.8 +CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
6.9 # CT_LIBC_UCLIBC_LOCALES is not set
6.10
6.11 #
7.1 --- a/samples/powerpc-unknown-linux-uclibc/crosstool.config Sun Sep 13 18:44:17 2009 +0200
7.2 +++ b/samples/powerpc-unknown-linux-uclibc/crosstool.config Sun Sep 13 18:59:36 2009 +0200
7.3 @@ -318,7 +318,7 @@
7.4 # CT_LIBC_UCLIBC_DEBUG_LEVEL_2 is not set
7.5 CT_LIBC_UCLIBC_DEBUG_LEVEL=0
7.6 CT_LIBC_UCLIBC_BUILD_CROSS_LDD=y
7.7 -CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/${samp_dir}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
7.8 +CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
7.9 # CT_LIBC_UCLIBC_LOCALES is not set
7.10
7.11 #
8.1 --- a/samples/x86_64-unknown-linux-uclibc/crosstool.config Sun Sep 13 18:44:17 2009 +0200
8.2 +++ b/samples/x86_64-unknown-linux-uclibc/crosstool.config Sun Sep 13 18:59:36 2009 +0200
8.3 @@ -320,7 +320,7 @@
8.4 # CT_LIBC_UCLIBC_DEBUG_LEVEL_2 is not set
8.5 CT_LIBC_UCLIBC_DEBUG_LEVEL=0
8.6 CT_LIBC_UCLIBC_BUILD_CROSS_LDD=y
8.7 -CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/${samp_dir}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
8.8 +CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
8.9 # CT_LIBC_UCLIBC_LOCALES is not set
8.10
8.11 #
9.1 --- a/scripts/build/companion_libs/cloog.sh Sun Sep 13 18:44:17 2009 +0200
9.2 +++ b/scripts/build/companion_libs/cloog.sh Sun Sep 13 18:59:36 2009 +0200
9.3 @@ -34,22 +34,31 @@
9.4 }
9.5
9.6 do_cloog() {
9.7 + local _t
9.8 +
9.9 + # Version 0.15.3 has a dirname 'cloog-ppl' (with no version in it!)
9.10 + # while versions 0.15.4 onward do have the version in the dirname.
9.11 + case "${CT_CLOOG_VERSION}" in
9.12 + 0.15.3) _t="";;
9.13 + *) _t="-${CT_CLOOG_VERSION}";;
9.14 + esac
9.15 +
9.16 mkdir -p "${CT_BUILD_DIR}/build-cloog-ppl"
9.17 cd "${CT_BUILD_DIR}/build-cloog-ppl"
9.18
9.19 CT_DoStep INFO "Installing CLooG/ppl"
9.20
9.21 CT_DoLog EXTRA "Configuring CLooG/ppl"
9.22 - CFLAGS="${CT_CFLAGS_FOR_HOST}" \
9.23 - CT_DoExecLog ALL \
9.24 - "${CT_SRC_DIR}/cloog-ppl/configure" \
9.25 - --build=${CT_BUILD} \
9.26 - --host=${CT_HOST} \
9.27 - --prefix="${CT_PREFIX_DIR}" \
9.28 - --with-gmp="${CT_PREFIX_DIR}" \
9.29 - --with-ppl="${CT_PREFIX_DIR}" \
9.30 - --enable-shared \
9.31 - --disable-static \
9.32 + CFLAGS="${CT_CFLAGS_FOR_HOST}" \
9.33 + CT_DoExecLog ALL \
9.34 + "${CT_SRC_DIR}/cloog-ppl${_t}/configure" \
9.35 + --build=${CT_BUILD} \
9.36 + --host=${CT_HOST} \
9.37 + --prefix="${CT_PREFIX_DIR}" \
9.38 + --with-gmp="${CT_PREFIX_DIR}" \
9.39 + --with-ppl="${CT_PREFIX_DIR}" \
9.40 + --enable-shared \
9.41 + --disable-static \
9.42 --with-bits=gmp
9.43
9.44 CT_DoLog EXTRA "Building CLooG/ppl"
10.1 --- a/scripts/saveSample.sh.in Sun Sep 13 18:44:17 2009 +0200
10.2 +++ b/scripts/saveSample.sh.in Sun Sep 13 18:59:36 2009 +0200
10.3 @@ -99,7 +99,7 @@
10.4 if [ -n "${CT_LIBC_UCLIBC_CONFIG_FILE}" ]; then
10.5 # We save the file, and then point the saved sample to this file
10.6 CT_DoAddFileToSample "${CT_LIBC_UCLIBC_CONFIG_FILE}" "${samp_dir}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
10.7 - "${sed}" -r -i -e 's|^(CT_LIBC_UCLIBC_CONFIG_FILE)=.+$|\1="'"${samp_top_dir}"'/${samp_dir}/${CT_LIBC}-${CT_LIBC_VERSION}.config"|;' \
10.8 + "${sed}" -r -i -e 's|^(CT_LIBC_UCLIBC_CONFIG_FILE)=.+$|\1="'"${samp_top_dir}"'/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"|;' \
10.9 "${samp_dir}/crosstool.config"
10.10 else
10.11 # remove any dangling files