Fix host detection #94090 by Matthew Kennedy.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 37 insertions, 17 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index e3c40d8ca953..21c7bbbadf65 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/erlang
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.18 2005/05/30 18:19:43 swegener Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.19 2005/07/02 19:19:10 vapier Exp $
+
+  02 Jul 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/erlang-10.2.6-export-TARGET.patch, erlang-10.2.0.ebuild:
+  Fix host detection #94090 by Matthew Kennedy.
 
   30 May 2005; Sven Wegener <swegener@gentoo.org> erlang-9c-r2.ebuild,
   erlang-9c-r3.ebuild, erlang-10.2.0.ebuild:
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 69bdb04aab5c..87635f6a14c0 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -1,27 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 952017d9165b65d7786b75dbf44a10e2 erlang-9c-r1.ebuild 1686
-MD5 34c0e056c8174a645a278a6025e7dcc5 erlang-10.2.0.ebuild 2393
 MD5 f947170e5f0fef952a0efc7dcc947f37 erlang-8b.ebuild 1178
+MD5 b6c3d6f665c823117549728127487f4e metadata.xml 383
 MD5 92087ace1ec7f4f5fafb31419db5fafa erlang-9c-r3.ebuild 1822
+MD5 952017d9165b65d7786b75dbf44a10e2 erlang-9c-r1.ebuild 1686
 MD5 888709019e83eac37f3e95c7739de933 erlang-9c.ebuild 1505
+MD5 d0c7b54ad61876c2cf9679c3b4181c6a erlang-10.2.0.ebuild 2364
+MD5 3662a91920013bccfdb5a50a4dc12fe0 ChangeLog 3283
 MD5 4df8bcb2597f95b5d00f898f0dbc9e96 erlang-9c-r2.ebuild 1808
-MD5 4b06b5a116b6f4bad57998712431422e ChangeLog 3120
-MD5 b6c3d6f665c823117549728127487f4e metadata.xml 383
+MD5 b1f610dc1caa7c176d7da4919bcabba9 files/erlang-10.2.6-export-TARGET.patch 242
 MD5 f3de2b6ca821b977f0e1811a1f0a1409 files/digest-erlang-10.2.0 67
 MD5 e61c0249e23b7e44ef3629ea5dc5997a files/9c.patch 2005
-MD5 f3f6915d00f2f3f9f580db9ee946160a files/50erlang-gentoo.el 104
+MD5 9a235de49a6c0988f033448fdac8a0a8 files/digest-erlang-9c-r1 66
 MD5 0ef311d4fbeb2b5e16aab201dcf37297 files/digest-erlang-8b 67
 MD5 9a235de49a6c0988f033448fdac8a0a8 files/digest-erlang-9c 66
-MD5 9a235de49a6c0988f033448fdac8a0a8 files/digest-erlang-9c-r1 66
-MD5 ae2205c16664d70f5ea47d249b2e566f files/digest-erlang-9c-r2 66
-MD5 ae2205c16664d70f5ea47d249b2e566f files/digest-erlang-9c-r3 66
 MD5 e88b4d733b41026e691a981320ac7806 files/erlang-9c.patch.gz 1503
+MD5 ae2205c16664d70f5ea47d249b2e566f files/digest-erlang-9c-r3 66
+MD5 ae2205c16664d70f5ea47d249b2e566f files/digest-erlang-9c-r2 66
+MD5 f3f6915d00f2f3f9f580db9ee946160a files/50erlang-gentoo.el 104
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCm1ljI1lqEGTUzyQRAtxnAJ9cjuPhMBZV4roRI6VjNjYIHyIHiwCcCtIA
-WDckV52VHxSmQiPqfNtyfqk=
-=aYEB
+iD8DBQFCxujagIKl8Uu19MoRAhsIAKCBXPsDCkkxCjPzcFoHHBvF5WA+RACggxqw
+pQcmzbks9PuOLhgOYDwLj5o=
+=piCa
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/erlang/erlang-10.2.0.ebuild b/dev-lang/erlang/erlang-10.2.0.ebuild
index 3b9655a0db8d..b5b3c613b7ab 100644
--- a/dev-lang/erlang/erlang-10.2.0.ebuild
+++ b/dev-lang/erlang/erlang-10.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-10.2.0.ebuild,v 1.5 2005/05/30 18:19:43 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-10.2.0.ebuild,v 1.6 2005/07/02 19:19:10 vapier Exp $
 
 inherit eutils toolchain-funcs flag-o-matic elisp-common
 
@@ -24,17 +24,21 @@ DEPEND=">=dev-lang/perl-5.6.1
 	ssl? ( >=dev-libs/openssl-0.9.7d )
 	emacs? ( virtual/emacs )"
 
+S=${WORKDIR}/${MY_P}_${MyDate}
+
 SITEFILE=50erlang-gentoo.el
 
-S=${WORKDIR}/${MY_P}_${MyDate}
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-export-TARGET.patch
+}
 
 src_compile() {
 	[ "`gcc-fullversion`" == "3.3.2" ] && filter-mfpmath sse
 	[ "`gcc-fullversion`" == "3.3.3" ] && filter-mfpmath sse
 	addpredict /dev/pty # Bug #25366
 
-	#erlang configure seems to "misdetect" CHOST on amd64
-	[ "${ARCH}" = "amd64" ] && CHOST="x86_64-unknown-linux-gnu"
 	econf --enable-threads || die
 	make || die
 
diff --git a/dev-lang/erlang/files/erlang-10.2.6-export-TARGET.patch b/dev-lang/erlang/files/erlang-10.2.6-export-TARGET.patch
new file mode 100644
index 000000000000..13a68021e8be
--- /dev/null
+++ b/dev-lang/erlang/files/erlang-10.2.6-export-TARGET.patch
@@ -0,0 +1,11 @@
+--- Makefile.in
++++ Makefile.in
+@@ -85,7 +85,7 @@
+ MAKE    = @MAKE_PROG@
+ 
+ # This should be set to the target "arch-vendor-os"
+-TARGET  = @TARGET@
++export TARGET  = @TARGET@
+ 
+ # A BSD compatible install program
+ INSTALL         = @INSTALL@