Fix CT_DoExecLog usage when building GMP for target.
/trunk/scripts/build/gmp.sh | 8 4 4 0 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
1 # Build script for D.U.M.A.
3 is_enabled="${CT_DUMA}"
6 [ "${CT_DUMA}" = "y" ] || return 0
7 echo "duma_${CT_DUMA_VERSION}"
11 CT_GetFile "duma_${CT_DUMA_VERSION}" http://mesh.dl.sourceforge.net/sourceforge/duma/
12 # D.U.M.A. doesn't separate its name from its version with a dash,
13 # but with an underscore. Create a link so that crosstool-NG can
15 cd "${CT_TARBALLS_DIR}"
16 duma_ext=$(CT_GetFileExtension "duma_${CT_DUMA_VERSION}")
17 rm -f "duma-${CT_DUMA_VERSION}${duma_ext}"
18 ln -sf "duma_${CT_DUMA_VERSION}${duma_ext}" "duma-${CT_DUMA_VERSION}${duma_ext}"
21 do_debug_duma_extract() {
22 CT_ExtractAndPatch "duma-${CT_DUMA_VERSION}"
24 rm -f "duma-${CT_DUMA_VERSION}"
25 ln -sf "duma_${CT_DUMA_VERSION}" "duma-${CT_DUMA_VERSION}"
28 do_debug_duma_build() {
29 CT_DoStep INFO "Installing D.U.M.A."
30 CT_DoLog EXTRA "Copying sources"
31 cp -a "${CT_SRC_DIR}/duma_${CT_DUMA_VERSION}" "${CT_BUILD_DIR}/build-duma"
32 CT_Pushd "${CT_BUILD_DIR}/build-duma"
35 [ "${CT_CC_LANG_CXX}" = "y" ] && DUMA_CPP=1
37 # The shared library needs some love: some version have libduma.so.0.0,
38 # while others have libduma.so.0.0.0
39 duma_so=$(make -n -p 2>&1 |egrep '^libduma.so[^:]*:' |head -n 1 |cut -d : -f 1)
42 [ "${CT_DUMA_A}" = "y" ] && libs="${libs} libduma.a"
43 [ "${CT_DUMA_SO}" = "y" ] && libs="${libs} ${duma_so}"
45 CT_DoLog EXTRA "Building libraries '${libs}'"
46 make HOSTCC="${CT_CC_NATIVE}" \
47 HOSTCXX="${CT_CC_NATIVE}" \
48 CC="${CT_TARGET}-gcc" \
49 CXX="${CT_TARGET}-gcc" \
50 RANLIB="${CT_TARGET}-ranlib" \
51 DUMA_CPP="${DUMA_CPP}" \
52 ${libs} 2>&1 |CT_DoLog ALL
53 CT_DoLog EXTRA "Installing libraries '${libs}'"
54 install -m 644 ${libs} "${CT_SYSROOT_DIR}/usr/lib" 2>&1 |CT_DoLog ALL
55 if [ "${CT_DUMA_SO}" = "y" ]; then
56 CT_DoLog EXTRA "Installing shared library link"
57 ln -vsf ${duma_so} "${CT_SYSROOT_DIR}/usr/lib/libduma.so" 2>&1 |CT_DoLog ALL
58 CT_DoLog EXTRA "Installing wrapper script"
59 mkdir -p "${CT_DEBUG_INSTALL_DIR}/usr/bin"
60 # Install a simpler, smaller, safer wrapper than the one provided by D.U.M.A.
61 sed -r -e 's:^LIBDUMA_SO=.*:LIBDUMA_SO=/usr/lib/'"${duma_so}"':;' \
62 "${CT_LIB_DIR}/scripts/build/debug/duma.in" \
63 >"${CT_DEBUG_INSTALL_DIR}/usr/bin/duma"
64 chmod 755 "${CT_DEBUG_INSTALL_DIR}/usr/bin/duma"