Fix cross compiling. Fixes bug #169310.

Package-Manager: portage-2.1.2.1-r1

diff --git a/dev-util/ltrace/ChangeLog b/dev-util/ltrace/ChangeLog
index 4ec68d32a8f9e0ff8d8e70ae6ac671d3cc38ea44..ddd32d09d6750a38c9178e4b0dec36ca8418cd00 100644 (file)
--- 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/Manifest b/dev-util/ltrace/Manifest
index 0531eeeae91430b3d0ecf013c37aa55669cba6bf..cb378a0a3462c018c9e6d630313fb4bf0dee8763 100644 (file)
--- a/dev-util/ltrace/Manifest
+++ b/dev-util/ltrace/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 0.4-cross-compile.patch 1887 RMD160 f20d62ad0c56065c4aeaa511e40de7a6e9779f60 SHA1 401a383ad2fd1346bc65bc0d096e31431ffcd228 SHA256 fa77c1ad502b1f469b67d04eb6746a055e4be72add487ed05cc86a7c5c15b880
+MD5 28ba531b28a98232d0fa2b17ed4fa713 files/0.4-cross-compile.patch 1887
+RMD160 f20d62ad0c56065c4aeaa511e40de7a6e9779f60 files/0.4-cross-compile.patch 1887
+SHA256 fa77c1ad502b1f469b67d04eb6746a055e4be72add487ed05cc86a7c5c15b880 files/0.4-cross-compile.patch 1887
 AUX ltrace-0.3.31-64bit-fixes.patch 5964 RMD160 76c1803e81a0771d9b969f18614aa77ef3bc0ea3 SHA1 d3692d6e24de28d289ae175cc63355fc8afc062d SHA256 5f23011f58a626eb70fa083ebd11ca8cd09c28c8de7c6dd138ff5dc6e96b7f6b
 MD5 f196bc8262608da52e8a9cb90dbac6e5 files/ltrace-0.3.31-64bit-fixes.patch 5964
 RMD160 76c1803e81a0771d9b969f18614aa77ef3bc0ea3 files/ltrace-0.3.31-64bit-fixes.patch 5964
@@ -20,14 +27,14 @@ EBUILD ltrace-0.3.36.ebuild 836 RMD160 581d8ac1d4e6814293e62ba07b7662f0b938e1d1
 MD5 c8101c33f1fe8b32130ecc457a3fe768 ltrace-0.3.36.ebuild 836
 RMD160 581d8ac1d4e6814293e62ba07b7662f0b938e1d1 ltrace-0.3.36.ebuild 836
 SHA256 91d7d28b2c1e9c29180025b5d890bd83cb3c8b9ba945629571dc8e0b8dbaa53e ltrace-0.3.36.ebuild 836
-EBUILD ltrace-0.4.ebuild 814 RMD160 4cd4ea12f753ef6a4c4147237bcccdf14d828ddf SHA1 9395f9e7a72a5716ada2168abf8953d5bf493b32 SHA256 5ea397dd6b64e681a2e378c15198bb4cee50ac5de602e330ad15104a5a53073d
-MD5 5288b43c9bbeaf90f463175e9b315efb ltrace-0.4.ebuild 814
-RMD160 4cd4ea12f753ef6a4c4147237bcccdf14d828ddf ltrace-0.4.ebuild 814
-SHA256 5ea397dd6b64e681a2e378c15198bb4cee50ac5de602e330ad15104a5a53073d ltrace-0.4.ebuild 814
-MISC ChangeLog 3915 RMD160 7666f305007d11d8b93ae50b66b1f11bfd6ba55d SHA1 d298a6eaea2f77351cccbf1a9f59ceb9dca7eba5 SHA256 255b6b31dc6af994518a5c0d430d912b1e8ca6245984a162e33c23fb5e972b4d
-MD5 fa133b32eddb59218c2d23bc932dd07f ChangeLog 3915
-RMD160 7666f305007d11d8b93ae50b66b1f11bfd6ba55d ChangeLog 3915
-SHA256 255b6b31dc6af994518a5c0d430d912b1e8ca6245984a162e33c23fb5e972b4d ChangeLog 3915
+EBUILD ltrace-0.4.ebuild 896 RMD160 eddcf55059a3015476192dac4802ce59974c0b52 SHA1 72d64eda8f360bcde07106c735a8ae22c89955b9 SHA256 4fd39ee73d7e25c2584a3a004ef83016a1539a77d3c8a27b3773772fc3f3d99e
+MD5 545a65ffdd73417864a5099b8340af1e ltrace-0.4.ebuild 896
+RMD160 eddcf55059a3015476192dac4802ce59974c0b52 ltrace-0.4.ebuild 896
+SHA256 4fd39ee73d7e25c2584a3a004ef83016a1539a77d3c8a27b3773772fc3f3d99e ltrace-0.4.ebuild 896
+MISC ChangeLog 4068 RMD160 04133769a8ab64ecf44192fe96f01585369fe1ca SHA1 a501b86a6b0e716bde2ef28a03e7e3d069bf6a37 SHA256 bc123fbf63241be418a22c2a741b62299617096cc6a1a959dd630be7264ffc80
+MD5 e9a1ceb08da3088c03192009aa0bd9aa ChangeLog 4068
+RMD160 04133769a8ab64ecf44192fe96f01585369fe1ca ChangeLog 4068
+SHA256 bc123fbf63241be418a22c2a741b62299617096cc6a1a959dd630be7264ffc80 ChangeLog 4068
 MISC metadata.xml 163 RMD160 550da6b3a781aa96ffd5e99e373bde49cdc2ed30 SHA1 d44678d395f91799e0cff5b808e227a203520bd5 SHA256 4284d1b30ef24759f1c34ce51225d46b7312913508acf3469f8b66d72b176524
 MD5 db54a1d7c3a3c58f3425179fd9e043e3 metadata.xml 163
 RMD160 550da6b3a781aa96ffd5e99e373bde49cdc2ed30 metadata.xml 163
@@ -41,3 +48,10 @@ SHA256 5c8124743ae72c0983b5b75a4baf06ee1506232cae6890e45635948cc484065f files/di
 MD5 28d252e92fef0c8ac3e4d7ed2684b8bd files/digest-ltrace-0.4 482
 RMD160 b33591d21d38156ab59dc07814874d01466bac12 files/digest-ltrace-0.4 482
 SHA256 58f250bf15b7468d02181466510211f470c5e94db7a781fffb51c8c11ef75bc9 files/digest-ltrace-0.4 482
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF8fs5cxLzpIGCsLQRAtRKAKCA59okrN/h9mzv4XrDsX5wz4lKjACfZAFj
+JWiuyudNjoHsveaxwtIACXw=
+=2Ash
+-----END PGP SIGNATURE-----

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 (file)
index 0000000..c1f0c66
--- /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 122925c61ca3d5934acfc1539084824c9ef8a948..05fa4cdaca54487ab0bb7c85150350757c32d74e 100644 (file)
--- 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() {