Fix cross compiling. Fixes bug #169310.

(Portage version: 2.1.2.1-r1)

3 files changed, 77 insertions, 3 deletions

diff --git a/dev-util/ltrace/ChangeLog b/dev-util/ltrace/ChangeLog
index 4ec68d32a8f9..ddd32d09d675 100644
--- a/dev-util/ltrace/ChangeLog
+++ b/dev-util/ltrace/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/ltrace
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ltrace/ChangeLog,v 1.29 2007/02/10 16:32:32 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ltrace/ChangeLog,v 1.30 2007/03/10 00:26:19 betelgeuse Exp $
+
+  10 Mar 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +files/0.4-cross-compile.patch, ltrace-0.4.ebuild:
+  Fix cross compiling. Fixes bug #169310.
 
   10 Feb 2007; nixnut <nixnut@gentoo.org> ltrace-0.4.ebuild:
   Stable on ppc wrt bug 161844
diff --git a/dev-util/ltrace/files/0.4-cross-compile.patch b/dev-util/ltrace/files/0.4-cross-compile.patch
new file mode 100644
index 000000000000..c1f0c665c314
--- /dev/null
+++ b/dev-util/ltrace/files/0.4-cross-compile.patch
@@ -0,0 +1,67 @@
+diff -Naur ltrace-0.4.old/configure.ac ltrace-0.4/configure.ac
+--- ltrace-0.4.old/configure.ac	2007-03-08 01:08:45.000000000 +0200
++++ ltrace-0.4/configure.ac	2007-03-08 01:28:15.000000000 +0200
+@@ -8,6 +8,7 @@
+ AC_CANONICAL_HOST
+ HOST_OS="$host_os"
+ AC_SUBST(HOST_OS)
++AC_SUBST(host_cpu)
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
+@@ -84,4 +85,4 @@
+ dnl of libelf and ltrace matches.
+ AC_SYS_LARGEFILE
+ fi
+-AC_OUTPUT(Makefile)
++AC_OUTPUT([Makefile sysdeps/linux-gnu/Makefile])
+diff -Naur ltrace-0.4.old/sysdeps/linux-gnu/Makefile.in ltrace-0.4/sysdeps/linux-gnu/Makefile.in
+--- ltrace-0.4.old/sysdeps/linux-gnu/Makefile.in	1970-01-01 02:00:00.000000000 +0200
++++ ltrace-0.4/sysdeps/linux-gnu/Makefile.in	2007-03-08 01:26:25.000000000 +0200
+@@ -0,0 +1,46 @@
++ARCH		:=	$(shell echo @host_cpu@ | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
++			-e s/arm.*/arm/ -e s/sa110/arm/ -e s/ppc64/ppc/ -e s/s390x/s390/)
++
++CPPFLAGS	+=	-I$(TOPDIR)/sysdeps/linux-gnu/$(ARCH)
++
++OBJ		=	trace.o proc.o breakpoint.o
++
++all:		sysdep.h signalent.h syscallent.h signalent1.h syscallent1.h ../sysdep.o
++
++sysdep.h:	$(ARCH)/arch.h
++		cat $(ARCH)/arch.h > sysdep.h
++
++signalent.h:
++		cp $(ARCH)/signalent.h signalent.h
++signalent1.h:
++		if [ -f $(ARCH)/signalent1.h ]; then \
++			cp $(ARCH)/signalent1.h signalent1.h; \
++		else \
++			> signalent1.h; \
++		fi
++
++syscallent.h:
++		cp $(ARCH)/syscallent.h syscallent.h
++
++syscallent1.h:
++		if [ -f $(ARCH)/syscallent1.h ]; then \
++			cp $(ARCH)/syscallent1.h syscallent1.h; \
++		else \
++			> syscallent1.h; \
++		fi
++
++../sysdep.o:	os.o $(ARCH)/arch.o
++		$(CC) -nostdlib -r -o ../sysdep.o os.o $(ARCH)/arch.o
++
++os.o:		$(OBJ)
++		$(CC) -nostdlib -r -o os.o $(OBJ)
++
++$(ARCH)/arch.o:	dummy
++		$(MAKE) -C $(ARCH)
++
++clean:
++		$(MAKE) -C $(ARCH) clean
++		rm -f $(OBJ) sysdep.h signalent.h signalent1.h syscallent.h
++		rm -f syscallent1.h os.o sysdep.o ../sysdep.o
++
++dummy:
diff --git a/dev-util/ltrace/ltrace-0.4.ebuild b/dev-util/ltrace/ltrace-0.4.ebuild
index 122925c61ca3..05fa4cdaca54 100644
--- a/dev-util/ltrace/ltrace-0.4.ebuild
+++ b/dev-util/ltrace/ltrace-0.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ltrace/ltrace-0.4.ebuild,v 1.5 2007/02/10 16:32:32 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ltrace/ltrace-0.4.ebuild,v 1.6 2007/03/10 00:26:19 betelgeuse Exp $
 
-inherit eutils
+inherit eutils autotools
 
 MY_P="${P/-/_}"
 DEB_P="${MY_P}-1"
@@ -23,6 +23,9 @@ DEPEND="virtual/libc
 src_unpack() {
 	unpack ${A}
 	epatch "${WORKDIR}"/${DEB_P}.diff
+	cd "${S}"
+	epatch "${FILESDIR}/0.4-cross-compile.patch"
+	eautoconf
 }
 
 src_install() {