summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-07-02 19:19:10 +0000
committerMike Frysinger <vapier@gentoo.org>2005-07-02 19:19:10 +0000
commit647facfbf7a9f635b66f42b06b64960723f7c169 (patch)
tree1982adea53dfff2ba4fccd2f830d7ab963278053 /dev-lang
parentfixed various issues (deps, file locations, manpages) -- see changelog for mo... (diff)
downloadgentoo-2-647facfbf7a9f635b66f42b06b64960723f7c169.tar.gz
gentoo-2-647facfbf7a9f635b66f42b06b64960723f7c169.tar.bz2
gentoo-2-647facfbf7a9f635b66f42b06b64960723f7c169.zip
Fix host detection #94090 by Matthew Kennedy.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/erlang/ChangeLog8
-rw-r--r--dev-lang/erlang/erlang-10.2.0.ebuild12
-rw-r--r--dev-lang/erlang/files/erlang-10.2.6-export-TARGET.patch11
3 files changed, 25 insertions, 6 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/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@