- Added support for multiple versions of gdb (in line with the rest of
toolchain)
- Added gdb-6.7.1 (marked experimental, default is still 6.3)
- Adapted gdbserver package accordingly.
*Note for applying the patch*
I don't know how to build a patch that reflects this, so this needs to
be done manually.
(move patches to subdirectory, without loosing version control)
mkdir toolchain/gdb/patches/6.3
svn add toolchain/gdb/patches/6.3
for file in toolchain/gdb/patches/*.patch; \
do svn move $file toolchain/gdb/patches/6.3 \
done
Signed-off-by: Harald Schioeberg <[EMAIL PROTECTED]>
Index: toolchain/Config.in
===================================================================
--- toolchain/Config.in (revision 10094)
+++ toolchain/Config.in (working copy)
@@ -12,14 +12,8 @@
source "toolchain/binutils/Config.in"
source "toolchain/gcc/Config.in"
+source "toolchain/gdb/Config.in"
-config GDB
- bool
- prompt "Build gdb" if TOOLCHAINOPTS
- default n
- help
- Enable if you want to build the gdb
-
config LARGEFILE
bool
prompt "Enable large file (files > 2 GB) support?" if TOOLCHAINOPTS
Index: toolchain/gdb/Config.in
===================================================================
--- toolchain/gdb/Config.in (revision 0)
+++ toolchain/gdb/Config.in (revision 0)
@@ -0,0 +1,27 @@
+config GDB
+ bool
+ prompt "Build gdb" if TOOLCHAINOPTS
+ default n
+ help
+ Enable if you want to build the gdb
+
+choice
+ prompt "GDB Version" if TOOLCHAINOPTS && GDB
+ default GDB_VERSION_6_3
+ help
+ Select the version of GDB you wish to use.
+
+ config GDB_VERSION_6_3
+ bool "GDB 6.3"
+ config GDB_VERSION_6_7_1
+ bool "GDB 6.7.1 (EXPERIMENTAL)"
+endchoice
+
+config GDB_VERSION
+ string
+ prompt "GBD Version" if (TOOLCHAINOPTS && NULL)
+ default "6.3" if GDB_VERSION_6_3
+ default "6.7.1" if GDB_VERSION_6_7_1
+ default "6.3"
+
+
Index: toolchain/gdb/Makefile
===================================================================
--- toolchain/gdb/Makefile (revision 10094)
+++ toolchain/gdb/Makefile (working copy)
@@ -7,18 +7,25 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=gdb
-PKG_VERSION:=6.3
+PKG_VERSION:=$(strip $(subst ",, $(CONFIG_GDB_VERSION)))
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_MD5SUM:=05b928f41fa5b482e49ca2c24762a0ae
PKG_SOURCE_URL:=http://ftp.gnu.org/gnu/gdb
PKG_CAT:=bzcat
+PKG_MD5SUM-6.3:=05b928f41fa5b482e49ca2c24762a0ae
+PKG_MD5SUM-6.7.1:=30a6bf36eded4ae5a152d7d71b86dc14
+PKG_MD5SUM:=$(PKG_MD5SUM-$(PKG_VERSION))
+
+PATCH_DIR:=./patches/$(PKG_VERSION)
STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
include $(INCLUDE_DIR)/host-build.mk
+EXTRA_CONF_VARS-6.3:=--disable-gdbmi
+EXTRA_CONF_VARS:=$(EXTRA_CONF_VARS-$(PKG_VERSION))
+
define Build/Configure
(cd $(PKG_BUILD_DIR); \
gdb_cv_func_sigsetjmp=yes \
@@ -28,10 +35,11 @@
--host=$(GNU_HOST_NAME) \
--target=$(REAL_GNU_TARGET_NAME) \
$(DISABLE_NLS) \
- --without-uiout --disable-gdbmi \
+ --without-uiout \
--disable-tui --disable-gdbtk --without-x \
--without-included-gettext \
--enable-threads \
+ $(EXTRA_CONF_VARS) \
);
endef
Index: package/gdbserver/Makefile
===================================================================
--- package/gdbserver/Makefile (revision 10094)
+++ package/gdbserver/Makefile (working copy)
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=gdbserver
-PKG_VERSION:=6.3
+PKG_VERSION:=$(strip $(subst ",, $(CONFIG_GDB_VERSION)))
PKG_RELEASE:=1
GDB_DIR:=$(BUILD_DIR_TOOLCHAIN)/gdb-$(PKG_VERSION)
_______________________________________________
openwrt-devel mailing list
[email protected]
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
