vars/build.vars:native_{toolchain_packages,packages_etc}: moves gdb (via Redfoxmoon.)

1 files changed, 12 insertions, 13 deletions

diff --git a/vars/build.vars b/vars/build.vars
index db5edc7e..bf6f380e 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -432,7 +432,7 @@ NATIVE_TOOLCHAIN_DEPS_PREFIX="${PREFIX_NATIVE}";
 #
 NATIVE_TOOLCHAIN_CONFIGURE_ARGS="--disable-nls --host=${DEFAULT_TARGET} --prefix=/ --target=${DEFAULT_TARGET}";
 NATIVE_TOOLCHAIN_PACKAGES="
-binutils musl_full gcc_full gdb";
+binutils musl_full gcc_full";
 NATIVE_TOOLCHAIN_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_BINUTILS_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa};
 : ${PKG_BINUTILS_VERSION:=2.24.51};
@@ -457,17 +457,6 @@ NATIVE_TOOLCHAIN_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_GCC_FULL_BASE_DIR:=${BUILD_WORKDIR}/gcc-native-${DEFAULT_TARGET}};
 : ${PKG_GCC_FULL_GITROOT:=${DEFAULT_GITROOT}};
 
-: ${PKG_GDB_SHA256SUM:=149abac4add030a5713f15964bd7465bef7a23712bcc91377ca40949f33e93fb};
-: ${PKG_GDB_VERSION:=7.12};
-: ${PKG_GDB_URL:=ftp://sourceware.org/pub/gdb/releases/gdb-${PKG_GDB_VERSION}.tar.gz};
-: ${PKG_GDB_CFLAGS_CONFIGURE_EXTRA:="--sysroot=${PREFIX_NATIVE} -g3 -O0 --include=stdc-predef.h -I${PREFIX_NATIVE}/include/python2.7 -L${PREFIX_NATIVE}/lib"};
-: ${PKG_GDB_CXXFLAGS_CONFIGURE_EXTRA:="--sysroot=${PREFIX_NATIVE} -g3 -O0 --include=stdc-predef.h -I${PREFIX_NATIVE}/include/python2.7 -L${PREFIX_NATIVE}/lib"};
-: ${PKG_GDB_CONFIGURE_ARGS_EXTRA:="--with-system-libiberty --with-system-readline --with-system-zlib --with-python=${PWD}/sigh/python2.7-config"};
-: ${PKG_GDB_ENV_VARS_EXTRA:="CFLAGS_FOR_TARGET=-g3 -O0 --include=stdc-predef.h -I${PREFIX_NATIVE}/include/python2.7 --sysroot=${PREFIX_NATIVE}:LDFLAGS_FOR_TARGET=--sysroot=${PREFIX_NATIVE}"};
-: ${PKG_GDB_LIBTOOL:=rdlibtool};
-: ${PKG_GDB_MAKEFLAGS_BUILD_EXTRA:="SYSROOT_FLAGS=--sysroot=${PREFIX_NATIVE}"};
-: ${PKG_GDB_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/gdb/gdb-${PKG_GDB_VERSION}.midipix.patch"};
-
 
 #
 # Build target native_toolchain_mingw32
@@ -1474,7 +1463,7 @@ bison chicken cparser diffutils flex lunix m4 make mandoc nasm patch patchutils
 #
 # Packages list native_packages_etc
 NATIVE_PACKAGES_ETC_PACKAGES="
-ca_certificates cron dante debianutils emacs fetchmail ffmpeg gnuchess ghostscript hastyhex hexcurse htop icecast isync infounzip
+ca_certificates cron dante debianutils emacs fetchmail ffmpeg gdb gnuchess ghostscript hastyhex hexcurse htop icecast isync infounzip
 infozip jamvm classpath john less mlogin mc mintty nano ncdu p7zip procps_ng qemu qpdf rdesktop rw rxvt_unicode st
 tmux tzdb vim yabasic xcowsay xeyes xorriso xterm xwd";
 : ${PKG_CA_CERTIFICATES_URLS_GIT:="ca-certificates=https://github.com/Redfoxmoon3/ca-certificates@master"};
@@ -1511,6 +1500,16 @@ tmux tzdb vim yabasic xcowsay xeyes xorriso xterm xwd";
 : ${PKG_FFMPEG_URL:=https://ffmpeg.org/releases/ffmpeg-${PKG_FFMPEG_VERSION}.tar.bz2};
 : ${PKG_FFMPEG_CONFIGURE_ARGS:="--cc=${DEFAULT_TARGET}-gcc --cxx=${DEFAULT_TARGET}-g++ --disable-stripping --enable-cross-compile --enable-libshine --enable-libtheora --enable-libvorbis --enable-libxml2 --enable-openssl --pkg-config=${PREFIX}/bin/${DEFAULT_TARGET}-pkg-config --prefix=/ --target-os=midipix --x86asmexe=${DEFAULT_TARGET}-nasm"};
 : ${PKG_FFMPEG_CFLAGS_BUILD_EXTRA:="-I${PREFIX_NATIVE}/include/SDL2 -I${PREFIX_NATIVE}/include/libxml2 -std=gnu99"};
+: ${PKG_GDB_SHA256SUM:=149abac4add030a5713f15964bd7465bef7a23712bcc91377ca40949f33e93fb};
+: ${PKG_GDB_VERSION:=7.12};
+: ${PKG_GDB_URL:=ftp://sourceware.org/pub/gdb/releases/gdb-${PKG_GDB_VERSION}.tar.gz};
+: ${PKG_GDB_CFLAGS_CONFIGURE_EXTRA:="--sysroot=${PREFIX_NATIVE} -g3 -O0 --include=stdc-predef.h -I${PREFIX_NATIVE}/include/python2.7 -L${PREFIX_NATIVE}/lib"};
+: ${PKG_GDB_CXXFLAGS_CONFIGURE_EXTRA:="--sysroot=${PREFIX_NATIVE} -g3 -O0 --include=stdc-predef.h -I${PREFIX_NATIVE}/include/python2.7 -L${PREFIX_NATIVE}/lib"};
+: ${PKG_GDB_CONFIGURE_ARGS_EXTRA:="--with-system-libiberty --with-system-readline --with-system-zlib --with-python=${PWD}/sigh/python2.7-config"};
+: ${PKG_GDB_ENV_VARS_EXTRA:="CFLAGS_FOR_TARGET=-g3 -O0 --include=stdc-predef.h -I${PREFIX_NATIVE}/include/python2.7 --sysroot=${PREFIX_NATIVE}:LDFLAGS_FOR_TARGET=--sysroot=${PREFIX_NATIVE}"};
+: ${PKG_GDB_LIBTOOL:=rdlibtool};
+: ${PKG_GDB_MAKEFLAGS_BUILD_EXTRA:="SYSROOT_FLAGS=--sysroot=${PREFIX_NATIVE}"};
+: ${PKG_GDB_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/gdb/gdb-${PKG_GDB_VERSION}.midipix.patch"};
 : ${PKG_GNUCHESS_SHA256SUM:=9a99e963355706cab32099d140b698eda9de164ebce40a5420b1b9772dd04802};
 : ${PKG_GNUCHESS_VERSION:=6.2.5};
 : ${PKG_GNUCHESS_URL:=http://ftp.gnu.org/gnu/chess/gnuchess-${PKG_GNUCHESS_VERSION}.tar.gz};