summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Faulhammer <opfer@gentoo.org>2006-11-08 22:25:25 +0000
committerChristian Faulhammer <opfer@gentoo.org>2006-11-08 22:25:25 +0000
commitc892f8d4c5327389979242c9b7b8d0e3829150f7 (patch)
treebe0e2b8cd93254d4b2ae8680af29187b497462ae
parentInitial commit of innotop (diff)
downloadgentoo-2-c892f8d4c5327389979242c9b7b8d0e3829150f7.tar.gz
gentoo-2-c892f8d4c5327389979242c9b7b8d0e3829150f7.tar.bz2
gentoo-2-c892f8d4c5327389979242c9b7b8d0e3829150f7.zip
disable High Performance Erlang (HiPE) because it breaks some systems, especially hardened. Also fix an glibc error. Thanks to Alexander Gabert <a.gabert@fh-trier.de>, Kenny Bentley <seriousmoose@yahoo.com>, Chris Carlin <ccarlin@physics.tamu.edu>, Chainsaw and nattfodd. Bugs #119753, #154338 and # 151612
(Portage version: 2.1.1-r1)
-rw-r--r--dev-lang/erlang/ChangeLog9
-rw-r--r--dev-lang/erlang/erlang-11.2.1.ebuild11
2 files changed, 18 insertions, 2 deletions
diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index e3f555fe1435..32e09dcf3a86 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-lang/erlang
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.36 2006/11/08 06:51:55 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.37 2006/11/08 22:25:25 opfer Exp $
+
+ 08 Nov 2006; Christian Faulhammer <opfer@gentoo.org> erlang-11.2.1.ebuild:
+ disable High Performance Erlang (HiPE) because it breaks some systems,
+ especially hardened. Also fix an glibc error. Thanks to Alexander Gabert
+ <a.gabert@fh-trier.de>, Kenny Bentley <seriousmoose@yahoo.com>, Chris Carlin
+ <ccarlin@physics.tamu.edu>, Chainsaw and nattfodd. Bugs #119753, #154338 and
+ # 151612
08 Nov 2006; Christian Faulhammer <opfer@gentoo.org> erlang-11.2.1.ebuild:
fix compilation on hardened systems by filtering SSP, see bug #154338.
diff --git a/dev-lang/erlang/erlang-11.2.1.ebuild b/dev-lang/erlang/erlang-11.2.1.ebuild
index 50f69e6ae702..e2f1febdcb22 100644
--- a/dev-lang/erlang/erlang-11.2.1.ebuild
+++ b/dev-lang/erlang/erlang-11.2.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-11.2.1.ebuild,v 1.3 2006/11/08 06:51:55 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-11.2.1.ebuild,v 1.4 2006/11/08 22:25:25 opfer Exp $
inherit eutils multilib flag-o-matic elisp-common versionator
@@ -46,11 +46,20 @@ src_unpack() {
epatch "${FILESDIR}/10.2.6-manpage-emacs-gentoo.patch"
use odbc || sed -i 's: odbc : :' lib/Makefile
# epatch "${DISTDIR}"/otp_src_${MY_PV}_epoll.patch
+
+ # bug 151612
+ einfo "fixing hardcoded GLIBC_MINOR value dependency on signal
+ handling (#151612)"
+ sed -i "s/__GLIBC_MINOR__\ ==\ 3/__GLIBC_MINOR__\ \>=\ 3/g" \
+ ${S}/erts/emulator/hipe/hipe_x86_signal.c
}
src_compile() {
use java || export JAVAC=false
+ ## disable High Performance Erlang (HiPE) to avoid a lot of
+ ## problems on hardened, bug #154338
econf \
+ --disable-hipe \
--enable-threads \
$(use_with ssl) \
|| die