Toolchain: move strace among addons

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>

3 files changed, 118 insertions, 16 deletions

diff --git a/core/toolchain/addons.mk b/core/toolchain/addons.mk
index 898a02f..cf1bd42 100644
--- a/core/toolchain/addons.mk
+++ b/core/toolchain/addons.mk
@@ -30,20 +30,6 @@ TOOLCHAIN_ADDONS_BUILD_DIR	:= $(TOOLCHAIN_DIR)/.embtk-toolchain_addons
 # Include .kconfig symbols if any
 -include $(call __embtk_pkg_dotkconfig_f,toolchain_addons)
 
-#
-# Addon: strace
-#
-EMBTK_TOOLCHAIN_ADDONS_DEPS-$(CONFIG_EMBTK_HAVE_STRACE) += strace_install
-
-#
-# Addon: gdb
-#
-EMBTK_TOOLCHAIN_ADDONS_DEPS-$(CONFIG_EMBTK_HAVE_GDB)	   += gdb_install
-EMBTK_TOOLCHAIN_ADDONS_DEPS-$(CONFIG_EMBTK_HAVE_GDBSERVER) += gdbserver_install
-EMBTK_TOOLCHAIN_ADDONS_DEPS-$(CONFIG_EMBTK_HOST_HAVE_GDB)  += gdb_host_install
-
-TOOLCHAIN_ADDONS_DEPS := $(EMBTK_TOOLCHAIN_ADDONS_DEPS-y)
-
 
 #
 # Toolchain addons build recipe
@@ -81,7 +67,17 @@ define __embtk_toolchain_addons_build
 endef
 
 #
-# Addons Makefile
+# Toolchain addons dependencies
 #
-include core/mk/strace.mk
+embtk_pkgincdir := core/toolchain/addons
+
+# strace
+$(call embtk_include_xtoolpkg,strace,toolchain_addons)
+
+# Addon: gdb
+EMBTK_TOOLCHAIN_ADDONS_DEPS-$(CONFIG_EMBTK_HAVE_GDB)	   += gdb_install
+EMBTK_TOOLCHAIN_ADDONS_DEPS-$(CONFIG_EMBTK_HAVE_GDBSERVER) += gdbserver_install
+EMBTK_TOOLCHAIN_ADDONS_DEPS-$(CONFIG_EMBTK_HOST_HAVE_GDB)  += gdb_host_install
 include packages/development/gdb/gdb.mk
+
+TOOLCHAIN_ADDONS_DEPS := $(EMBTK_TOOLCHAIN_ADDONS_DEPS-y)
diff --git a/core/toolchain/addons/strace/strace.kconfig b/core/toolchain/addons/strace/strace.kconfig
new file mode 100644
index 0000000..866ab59
--- /dev/null
+++ b/core/toolchain/addons/strace/strace.kconfig
@@ -0,0 +1,72 @@
+################################################################################
+# Embtoolkit
+# Copyright(C) 2009-2014 Abdoulaye Walsimou GAYE.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+################################################################################
+#
+# \file         strace.kconfig
+# \brief	strace.kconfig of Embtoolkit
+# \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
+# \date         August 2009
+################################################################################
+
+config EMBTK_HAVE_STRACE
+	bool "Have strace in target"
+	help
+	 strace is a system call tracer, i.e. a debugging tool which prints out
+	 a trace of all the system calls made by a another process/program.
+
+choice
+	prompt "starce version to use"
+	depends on EMBTK_HAVE_STRACE
+
+	config EMBTK_STRACE_VERSION_4_9
+		bool "strace-embtk-pre4.9"
+		select EMBTK_STRACE_NEED_PATCH
+	config EMBTK_STRACE_VERSION_GIT
+		bool "strace-git"
+		select EMBTK_STRACE_NEED_AUTORECONF
+		help
+		 Say Y here to use strace development version from its git
+		 repository.
+endchoice
+
+config EMBTK_STRACE_GIT_BRANCH
+	string "Branch to use"
+	default "master"
+	depends on EMBTK_STRACE_VERSION_GIT
+	help
+	 The branch of the git repository to use, the default is master.
+
+config EMBTK_STRACE_REFSPEC
+	string
+	default "toolchain"
+
+#
+# Versions strings
+#
+config EMBTK_STRACE_VERSION_STRING
+	string
+	default "embtk-pre4.9"	if EMBTK_STRACE_VERSION_4_9
+	default "git"           if EMBTK_STRACE_VERSION_GIT
+
+#
+# autoreconf and patch
+#
+config EMBTK_STRACE_NEED_PATCH
+	bool
+config EMBTK_STRACE_NEED_AUTORECONF
+	bool
diff --git a/core/toolchain/addons/strace/strace.mk b/core/toolchain/addons/strace/strace.mk
new file mode 100644
index 0000000..c075799
--- /dev/null
+++ b/core/toolchain/addons/strace/strace.mk
@@ -0,0 +1,34 @@
+################################################################################
+# Embtoolkit
+# Copyright(C) 2009-2013 Abdoulaye Walsimou GAYE.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+################################################################################
+#
+# \file         strace.mk
+# \brief	strace.mk of Embtoolkit.
+# \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
+# \date         August 2009
+################################################################################
+
+STRACE_NAME		:= strace
+STRACE_VERSION		:= $(call embtk_get_pkgversion,strace)
+STRACE_SITE		:= http://downloads.sourceforge.net/project/strace/strace/$(STRACE_VERSION)
+STRACE_GIT_SITE		:= git://git.code.sf.net/p/strace/code
+STRACE_PACKAGE		:= strace-$(STRACE_VERSION).tar.bz2
+STRACE_SRC_DIR		:= $(embtk_pkgb)/strace-$(STRACE_VERSION)
+STRACE_BUILD_DIR	:= $(embtk_pkgb)/strace-build
+
+STRACE_BINS		:= strace strace-graph