* patches/gdb-6.7:

	removed

	* patches/gdb-6.8, patches/gdb-6.8/generic/m68k-linux-nat-get_regcache_arch.patch:
	added, coldfire patch by: Carsten Schlote

	* rules/gdb.make, rules/gdbserver.make, rules/gdb.in, rules/gdbserver.in:
	cleanups, version bump to 6.8 (but now configureable)


git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8188 33e552b5-05e3-0310-8538-816dae2090ed

1 files changed, 32 insertions, 73 deletions

diff --git a/rules/gdb.make b/rules/gdb.make
index 8a8d75d59..3bb852670 100644
--- a/rules/gdb.make
+++ b/rules/gdb.make
@@ -1,10 +1,10 @@
 # -*-makefile-*-
 # $Id$
 #
-# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2002-2008 by Pengutronix e.K., Hildesheim, Germany
 # Copyright (C) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
 #
-# See CREDITS for details about who has contributed to this project. 
+# See CREDITS for details about who has contributed to this project.
 #
 # For further information about the PTXdist project and license conditions
 # see the README file.
@@ -16,118 +16,77 @@
 PACKAGES-$(PTXCONF_GDB) += gdb
 
 #
-# Paths and names 
+# Paths and names
 #
-GDB_VERSION	= 6.7
-GDB		= gdb-$(GDB_VERSION)
-GDB_SUFFIX	= tar.bz2
-GDB_URL		= $(PTXCONF_SETUP_GNUMIRROR)/gdb/$(GDB).$(GDB_SUFFIX)
-GDB_SOURCE	= $(SRCDIR)/$(GDB).$(GDB_SUFFIX)
-GDB_DIR		= $(BUILDDIR)/$(GDB)
-GDB_BUILDDIR	= $(BUILDDIR)/$(GDB)-build
-
+GDB_VERSION	:= $(call remove_quotes,$(PTXCONF_GDB__VERSION))
+GDB		:= gdb-$(GDB_VERSION)
+GDB_SUFFIX	:= tar.bz2
+GDB_URL		:= $(PTXCONF_SETUP_GNUMIRROR)/gdb/$(GDB).$(GDB_SUFFIX)
+GDB_SOURCE	:= $(SRCDIR)/$(GDB).$(GDB_SUFFIX)
+GDB_DIR		:= $(BUILDDIR)/$(GDB)
+GDB_BUILDDIR	:= $(BUILDDIR)/$(GDB)-build
 
 # ----------------------------------------------------------------------------
 # Get
 # ----------------------------------------------------------------------------
 
-gdb_get: $(STATEDIR)/gdb.get
-
-$(STATEDIR)/gdb.get: $(gdb_get_deps_default) $(GDB_SOURCE)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
-
 $(GDB_SOURCE):
-	@$(call targetinfo, $@)
+	@$(call targetinfo)
 	@$(call get, GDB)
 
 # ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-gdb_extract: $(STATEDIR)/gdb.extract
-
-$(STATEDIR)/gdb.extract: $(gdb_extract_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(GDB_DIR))
-	@$(call extract, GDB)
-	@$(call patchin, GDB)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-gdb_prepare: $(STATEDIR)/gdb.prepare
-
-GDB_PATH	=  PATH=$(CROSS_PATH)
-
-GDB_ENV_AC	= \
-	$(CROSS_ENV_AC) \
-	gdb_cv_func_sigsetjmp=yes \
-	bash_cv_func_strcoll_broken=no \
-	bash_cv_must_reinstall_sighandlers=no \
-	bash_cv_func_sigsetjmp=present \
-	bash_cv_have_mbstate_t=yes
-
-GDB_ENV		= \
+GDB_PATH	:= PATH=$(CROSS_PATH)
+GDB_ENV		:= \
 	$(CROSS_ENV) \
-	$(CROSS_ENV_FLAGS_FOR_TARGET) \
-	$(GDB_ENV_AC) \
-	CFLAGS='$(strip $(CROSS_CFLAGS)) $(strip $(CROSS_CPPFLAGS))' \
-	CFLAGS_FOR_TARGET='$(strip $(CROSS_CFLAGS)) $(strip $(CROSS_CPPFLAGS))'
+	$(CROSS_ENV_FLAGS_FOR_TARGET)
 
-ifndef PTXCONF_GDB_SHARED
-GDB_MAKEVARS	=  LDFLAGS=-static
+ifndef PTXCONF_GDB__SHARED
+GDB_MAKEVARS	:=  LDFLAGS=-static
 endif
 
 #
 # autoconf
 #
-GDB_AUTOCONF = \
+GDB_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
-	--target=$(call remove_quotes,$(PTXCONF_GNU_TARGET)) \
-	--enable-serial-configure \
+	--target=$(PTXCONF_GNU_TARGET) \
 	--with-build-sysroot=$(SYSROOT)
 
-$(STATEDIR)/gdb.prepare: $(gdb_prepare_deps_default)
-	@$(call targetinfo, $@)
+$(STATEDIR)/gdb.prepare:
+	@$(call targetinfo)
 	@$(call clean, $(GDB_BUILDDIR))
 	mkdir -p $(GDB_BUILDDIR)
 	cd $(GDB_BUILDDIR) && \
 		$(GDB_PATH) $(GDB_ENV) \
 		$(GDB_DIR)/configure $(GDB_AUTOCONF)
-	@$(call touch, $@)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Compile
 # ----------------------------------------------------------------------------
 
-gdb_compile: $(STATEDIR)/gdb.compile
-
-$(STATEDIR)/gdb.compile: $(gdb_compile_deps_default)
-	@$(call targetinfo, $@)
-	cd $(GDB_BUILDDIR) && $(GDB_PATH) $(GDB_ENV_AC) make
-	@$(call touch, $@)
+$(STATEDIR)/gdb.compile:
+	@$(call targetinfo)
+	cd $(GDB_BUILDDIR) && $(GDB_PATH) $(MAKE) $(PARALLELMFLAGS)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Install
 # ----------------------------------------------------------------------------
 
-gdb_install: $(STATEDIR)/gdb.install
-
-$(STATEDIR)/gdb.install: $(gdb_install_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+$(STATEDIR)/gdb.install:
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
 
-gdb_targetinstall: $(STATEDIR)/gdb.targetinstall
-
-$(STATEDIR)/gdb.targetinstall: $(gdb_targetinstall_deps_default)
-	@$(call targetinfo, $@)
+$(STATEDIR)/gdb.targetinstall:
+	@$(call targetinfo)
 
 	mkdir -p $(ROOTDIR)/usr/bin
 
@@ -143,13 +102,13 @@ $(STATEDIR)/gdb.targetinstall: $(gdb_targetinstall_deps_default)
 	@$(call install_copy, gdb, 0, 0, 0755, $(GDB_BUILDDIR)/gdb/gdb, /usr/bin/gdb)
 
 	@$(call install_finish, gdb)
-	@$(call touch, $@)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Clean
 # ----------------------------------------------------------------------------
 
-gdb_clean: 
+gdb_clean:
 	rm -rf $(STATEDIR)/gdb.* $(GDB_DIR)
 	rm -rf $(IMAGEDIR)/gdb_*