ltrace: fix wrong path to coreutils-native and add actual dependency

2 files changed, 11 insertions, 75 deletions

diff --git a/recipes/ltrace/ltrace_0.4.bb b/recipes/ltrace/ltrace_0.4.bb
deleted file mode 100644
index 9dc959e484..0000000000
--- a/recipes/ltrace/ltrace_0.4.bb
+++ /dev/null
@@ -1,65 +0,0 @@
-DESCRIPTION = "ltrace shows runtime library call information for dynamically linked executables."
-HOMEPAGE = "http://packages.debian.org/unstable/utils/ltrace.html"
-SECTION = "devel"
-DEPENDS = "binutils libelf"
-LICENSE = "GPL"
-PR = "r3"
-
-SRC_URI = "${DEBIAN_MIRROR}/main/l/ltrace/ltrace_0.4.orig.tar.gz \
-           ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_0.4-1.diff.gz;patch=1 \
-           file://no-usr-include.patch;patch=1"
-
-inherit autotools
-
-PARALLEL_MAKE = ""
-EXTRA_OEMAKE = "INSTALL_FILE='$(INSTALL) -p -m 0644' \
-		INSTALL_PROGRAM='$(INSTALL) -p -m 0755' \
-		INSTALL_SCRIPT='$(INSTALL) -p -m 0755' \
-		INSTALL_DIR='$(INSTALL) -p -d -m 0755' "
-
-export TARGET_CFLAGS = "${SELECTED_OPTIMIZATION} -isystem ${STAGING_INCDIR}"
-TARGET_CC_ARCH += "${LDFLAGS}"
-
-do_configure_prepend() {
-	ln -sf ./linux-gnu sysdeps/linux-gnueabi
-}
-
-do_compile() {
-	case ${TARGET_ARCH} in
-		alpha*)   LTRACE_ARCH=alpha ;;
-		arm*)     LTRACE_ARCH=arm ;;
-		cris*)    LTRACE_ARCH=cris ;;
-		hppa*)    LTRACE_ARCH=parisc ;;
-		i*86*)    LTRACE_ARCH=i386 ;;
-		ia64*)    LTRACE_ARCH=ia64 ;;
-		mips*)    LTRACE_ARCH=mips ;;
-		m68k*)    LTRACE_ARCH=m68k ;;
-		powerpc*) LTRACE_ARCH=ppc ;;
-		s390*)    LTRACE_ARCH=s390 ;;
-		sh*)      LTRACE_ARCH=sh ;;
-		sparc64*) LTRACE_ARCH=sparc64 ;;
-		sparc*)   LTRACE_ARCH=sparc ;;
-		x86_64*)  LTRACE_ARCH=x86_64 ;;
-	esac
-	oe_runmake LDFLAGS=${TARGET_LDFLAGS} LIBS="-lsupc++ -liberty -Wl,-Bstatic -lelf -Wl,-Bdynamic" ${EXTRA_OEMAKE} ARCH=${LTRACE_ARCH}
-}
-
-do_install() {
-	case ${TARGET_ARCH} in
-		alpha*)   LTRACE_ARCH=alpha ;;
-		arm*)     LTRACE_ARCH=arm ;;
-		cris*)    LTRACE_ARCH=cris ;;
-		hppa*)    LTRACE_ARCH=parisc ;;
-		i*86*)    LTRACE_ARCH=i386 ;;
-		ia64*)    LTRACE_ARCH=ia64 ;;
-		mips*)    LTRACE_ARCH=mips ;;
-		m68k*)    LTRACE_ARCH=m68k ;;
-		powerpc*) LTRACE_ARCH=ppc ;;
-		s390*)    LTRACE_ARCH=s390 ;;
-		sh*)      LTRACE_ARCH=sh ;;
-		sparc64*) LTRACE_ARCH=sparc64 ;;
-		sparc*)   LTRACE_ARCH=sparc ;;
-		x86_64*)  LTRACE_ARCH=x86_64 ;;
-	esac
-	oe_runmake install ${EXTRA_OEMAKE} ARCH=${LTRACE_ARCH} INSTALL=${STAGING_BINDIR_NATIVE}/install DESTDIR=${D}
-}
diff --git a/recipes/ltrace/ltrace_0.5.3.bb b/recipes/ltrace/ltrace_0.5.3.bb
index 050a023159..9296510f7d 100644
--- a/recipes/ltrace/ltrace_0.5.3.bb
+++ b/recipes/ltrace/ltrace_0.5.3.bb
@@ -1,17 +1,18 @@
 DESCRIPTION = "ltrace shows runtime library call information for dynamically linked executables."
 HOMEPAGE = "http://ltrace.alioth.debian.org"
 SECTION = "devel"
-DEPENDS = "libelf"
+DEPENDS = "coreutils-native libelf"
 LICENSE = "GPLv2"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/l/ltrace/ltrace_${PV}.orig.tar.gz \
-           ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_${PV}-2.diff.gz;patch=1 \
-	   file://add-sysdep.patch;patch=1 \
-	   file://ltrace-compile.patch;patch=1 \
-	   file://ltrace-mips-remove-CP.patch;patch=1 \
-	   file://ltrace-mips.patch;patch=1 \
-	   file://ltrace-ppc.patch;patch=1 \
-	  "
+SRC_URI = "\
+  ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_${PV}.orig.tar.gz \
+  ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_${PV}-2.diff.gz;patch=1 \
+  file://add-sysdep.patch;patch=1 \
+  file://ltrace-compile.patch;patch=1 \
+  file://ltrace-mips-remove-CP.patch;patch=1 \
+  file://ltrace-mips.patch;patch=1 \
+  file://ltrace-ppc.patch;patch=1 \
+"
 inherit autotools
 
 PARALLEL_MAKE = ""
@@ -70,5 +71,5 @@ do_install() {
 		sparc*)   LTRACE_ARCH=sparc ;;
 		x86_64*)  LTRACE_ARCH=x86_64 ;;
 	esac
-	oe_runmake install ${EXTRA_OEMAKE} ARCH=${LTRACE_ARCH} INSTALL=${STAGING_BINDIR_NATIVE}/install DESTDIR=${D}
+	oe_runmake install ${EXTRA_OEMAKE} ARCH=${LTRACE_ARCH} INSTALL=${STAGING_BINDIR_NATIVE}/install.coreutils-native DESTDIR=${D}
 }