From 58e22e313786e7ae61b5c5d450548128ffaf41ab Mon Sep 17 00:00:00 2001
From: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>
Date: Sun, 21 Feb 2010 11:38:25 +0100
Subject: Debug system: Strace: rework patch machinery

Signed-off-by: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>
---
 kconfig/strace.kconfig | 5 +++++
 mk/strace.mk           | 9 +++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/kconfig/strace.kconfig b/kconfig/strace.kconfig
index ff30693..6021e1f 100644
--- a/kconfig/strace.kconfig
+++ b/kconfig/strace.kconfig
@@ -34,8 +34,10 @@ choice
 	depends on EMBTK_ROOTFS_HAVE_STRACE
 	config EMBTK_STRACE_VERSION_4_5_19
 		bool "strace-4.5.19"
+		select EMBTK_STRACE_NEED_PATCH
 	config EMBTK_STRACE_VERSION_4_5_18
 		bool "strace-4.5.18"
+		select EMBTK_STRACE_NEED_PATCH
 endchoice
 
 config EMBTK_STRACE_VERSION_STRING
@@ -43,3 +45,6 @@ config EMBTK_STRACE_VERSION_STRING
 	default "4.5.19"	if EMBTK_STRACE_VERSION_4_5_19
 	default "4.5.18"	if EMBTK_STRACE_VERSION_4_5_18
 
+config EMBTK_STRACE_NEED_PATCH
+	bool
+
diff --git a/mk/strace.mk b/mk/strace.mk
index bd8f0d7..10c8b64 100644
--- a/mk/strace.mk
+++ b/mk/strace.mk
@@ -1,6 +1,6 @@
 ################################################################################
 # GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
-# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved.
+# Copyright(C) 2009-2010 GAYE Abdoulaye Walsimou. All rights reserved.
 #
 # This program is free software; you can distribute it and/or modify it
 # under the terms of the GNU General Public License
@@ -42,8 +42,11 @@ $(STRACE_BUILD_DIR)/.installed: download_strace \
 
 $(STRACE_BUILD_DIR)/.decompressed:
 	@tar -C $(PACKAGES_BUILD) -xjf $(DOWNLOAD_DIR)/$(STRACE_PACKAGE)
+ifeq ($(CONFIG_EMBTK_STRACE_NEED_PATCH),y)
 	@cd $(PACKAGES_BUILD)/strace-$(STRACE_VERSION); \
-	patch -p1 < $(DOWNLOAD_DIR)/strace-$(STRACE_VERSION).patch
+	patch -p1 < $(DOWNLOAD_DIR)/strace-$(STRACE_VERSION).patch; \
+	$(AUTORECONF)
+endif
 	@mkdir -p $(STRACE_BUILD_DIR)
 	@touch $@
 download_strace:
@@ -52,9 +55,11 @@ download_strace:
 	@test -e $(DOWNLOAD_DIR)/$(STRACE_PACKAGE) || \
 	wget $(STRACE_SITE)/$(STRACE_PACKAGE) \
 	-O $(DOWNLOAD_DIR)/$(STRACE_PACKAGE)
+ifeq ($(CONFIG_EMBTK_STRACE_NEED_PATCH),y)
 	@test -e $(DOWNLOAD_DIR)/strace-$(STRACE_VERSION).patch || \
 	wget -O $(DOWNLOAD_DIR)/strace-$(STRACE_VERSION).patch \
 	$(STRACE_PATCH_SITE)/strace-$(STRACE_VERSION)-*.patch
+endif
 
 $(STRACE_BUILD_DIR)/.configured:
 	$(call EMBTK_GENERIC_MESSAGE,"Configuring \
-- 
cgit v1.2.3