# HG changeset patch # User "Yann E. MORIN" # Date 1311977153 -7200 # Node ID b0cc1bf3e851103abe7ecf37b6bb84e5e8306ccb # Parent 6e1412ba8da9b9b8c100482fce442bf83d520f63 debug/gdb: don;t install sample gdbinit for old versions Only starting with gdb-7 does installing the gdbinit sample makes senses. Signed-off-by: "Yann E. MORIN" diff -r 6e1412ba8da9 -r b0cc1bf3e851 config/debug/gdb.in --- a/config/debug/gdb.in Fri Jul 29 13:04:49 2011 +0200 +++ b/config/debug/gdb.in Sat Jul 30 00:05:53 2011 +0200 @@ -73,10 +73,14 @@ config GDB_7_0_or_later bool select GDB_HAS_PKGVERSION_BUGURL + select GDB_INSTALL_GDBINIT config GDB_HAS_PKGVERSION_BUGURL bool +config GDB_INSTALL_GDBINIT + bool + config GDB_VERSION string # Don't remove next line diff -r 6e1412ba8da9 -r b0cc1bf3e851 scripts/build/debug/300-gdb.sh --- a/scripts/build/debug/300-gdb.sh Fri Jul 29 13:04:49 2011 +0200 +++ b/scripts/build/debug/300-gdb.sh Sat Jul 30 00:05:53 2011 +0200 @@ -150,20 +150,22 @@ CT_DoLog EXTRA "Installing cross-gdb" CT_DoExecLog ALL make install - CT_DoLog EXTRA "Install '.gdbinit' template" - # See in scripts/build/internals.sh for why we do this - if [ -f "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/gcc/BASE-VER" ]; then - gcc_version=$( cat "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/gcc/BASE-VER" ) - else - gcc_version=$( sed -r -e '/version_string/!d; s/^.+= "([^"]+)".*$/\1/;' \ - "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/gcc/version.c" \ - ) - fi - ${sed} -r \ - -e "s:@@PREFIX@@:${CT_PREFIX_DIR}:;" \ - -e "s:@@VERSION@@:${gcc_version}:;" \ - "${CT_LIB_DIR}/scripts/build/debug/gdbinit.in" \ - >"${CT_PREFIX_DIR}/share/gdb/gdbinit" + if [ "${CT_GDB_INSTALL_GDBINIT}" = "y" ]; then + CT_DoLog EXTRA "Install '.gdbinit' template" + # See in scripts/build/internals.sh for why we do this + if [ -f "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/gcc/BASE-VER" ]; then + gcc_version=$( cat "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/gcc/BASE-VER" ) + else + gcc_version=$( sed -r -e '/version_string/!d; s/^.+= "([^"]+)".*$/\1/;' \ + "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/gcc/version.c" \ + ) + fi + ${sed} -r \ + -e "s:@@PREFIX@@:${CT_PREFIX_DIR}:;" \ + -e "s:@@VERSION@@:${gcc_version}:;" \ + "${CT_LIB_DIR}/scripts/build/debug/gdbinit.in" \ + >"${CT_PREFIX_DIR}/share/gdb/gdbinit" + fi # Install gdbinit sample CT_EndStep fi