From: Tom Rini <tom_rini@mentor.com>
Date: Tue, 11 Jan 2011 17:35:08 +0000 (-0700)
Subject: ltrace: Rework sysdeps dependencies
X-Git-Tag: sz_160~25
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d98db5ef282d2758a5afe06c652f1b980f5d847;p=openembedded.git

ltrace: Rework sysdeps dependencies

The dependencies here were slightly lazy and in certain cases it was
possible to be building objects that required generated headers before
they were done.

Signed-off-by: Tom Rini <tom_rini@mentor.com>

Conflicts:

	recipes/ltrace/ltrace_0.5.3.bb
---

diff --git a/recipes/ltrace/files/ltrace-fix-sysdep_h-dependency.patch b/recipes/ltrace/files/ltrace-fix-sysdep_h-dependency.patch
new file mode 100644
index 0000000000..b9e5f7f3e5
--- /dev/null
+++ b/recipes/ltrace/files/ltrace-fix-sysdep_h-dependency.patch
@@ -0,0 +1,33 @@
+Index: ltrace-0.5.3/sysdeps/linux-gnu/Makefile
+===================================================================
+--- ltrace-0.5.3.orig/sysdeps/linux-gnu/Makefile
++++ ltrace-0.5.3/sysdeps/linux-gnu/Makefile
+@@ -12,7 +12,10 @@ CPPFLAGS	+=	-I$(TOPDIR)/sysdeps/linux-gn
+ 
+ OBJ		=	events.o trace.o proc.o breakpoint.o
+ 
+-all:		sysdep.h signalent.h syscallent.h arch_syscallent.h signalent1.h syscallent1.h ../sysdep.o
++HDRS		=	sysdep.h signalent.h syscallent.h arch_syscallent.h \
++			signalent1.h syscallent1.h
++
++all:		../sysdep.o
+ 
+ sysdep.h:	$(ARCH)/arch.h
+ 		cat $(ARCH)/arch.h > sysdep.h
+@@ -49,12 +52,14 @@ arch_syscallent.h:
+ os.o:		$(OBJ)
+ 		$(CC) -nostdlib -r -o os.o $(OBJ)
+ 
++$(OBJ):		$(HDRS)
++
+ $(ARCH)/arch.o:	dummy
+ 		$(MAKE) -C $(ARCH)
+ 
+ clean:
+ 		$(MAKE) -C $(ARCH) clean
+-		rm -f $(OBJ) sysdep.h signalent.h signalent1.h syscallent.h arch_syscallent.h
+-		rm -f syscallent1.h os.o sysdep.o ../sysdep.o
++		rm -f $(HDRS)
++		rm -f $(OBJ) os.o sysdep.o ../sysdep.o
+ 
+ dummy:
diff --git a/recipes/ltrace/ltrace_0.5.3.bb b/recipes/ltrace/ltrace_0.5.3.bb
index f9c87472b9..ea8a0fa6e9 100644
--- a/recipes/ltrace/ltrace_0.5.3.bb
+++ b/recipes/ltrace/ltrace_0.5.3.bb
@@ -4,7 +4,7 @@ SECTION = "devel"
 DEPENDS = "libelf binutils"
 LICENSE = "GPLv2"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "\
   ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_${PV}.orig.tar.gz \
@@ -14,6 +14,7 @@ SRC_URI = "\
   file://ltrace-mips-remove-CP.patch;patch=1 \
   file://ltrace-mips.patch;patch=1 \
   file://ltrace-ppc.patch;patch=1 \
+  file://ltrace-fix-sysdep_h-dependency.patch;patch=1 \
 "
 inherit autotools