summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-05-28 21:26:19 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-05-28 21:26:19 +0000
commitbbaee30c39abbe040b326419793903b625c69594 (patch)
treeeaedaea8d8602f596f952f8bbca06c0aafa2f442 /dev-lang
parentAdded app-text/texlive to p.mask (diff)
downloadgentoo-2-bbaee30c39abbe040b326419793903b625c69594.tar.gz
gentoo-2-bbaee30c39abbe040b326419793903b625c69594.tar.bz2
gentoo-2-bbaee30c39abbe040b326419793903b625c69594.zip
Respect LDFLAGS but filter -Bdirect for some libraries.
(Portage version: 2.1_rc3)
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/ruby/ChangeLog6
-rw-r--r--dev-lang/ruby/ruby-1.8.4.20060226.ebuild13
2 files changed, 16 insertions, 3 deletions
diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 30e2261ba451..3ebf4778e6b4 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/ruby
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.197 2006/05/28 20:13:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.198 2006/05/28 21:26:19 flameeyes Exp $
+
+ 28 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+ ruby-1.8.4.20060226.ebuild:
+ Respect LDFLAGS but filter -Bdirect for some libraries.
28 May 2006; Diego Pettenò <flameeyes@gentoo.org>
ruby-1.8.4.20060226.ebuild:
diff --git a/dev-lang/ruby/ruby-1.8.4.20060226.ebuild b/dev-lang/ruby/ruby-1.8.4.20060226.ebuild
index 2f3309eddaaa..62a8e1f468ef 100644
--- a/dev-lang/ruby/ruby-1.8.4.20060226.ebuild
+++ b/dev-lang/ruby/ruby-1.8.4.20060226.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/ruby/ruby-1.8.4.20060226.ebuild,v 1.5 2006/05/28 20:13:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.4.20060226.ebuild,v 1.6 2006/05/28 21:26:19 flameeyes Exp $
ONIGURUMA="onigd2_5_4"
@@ -58,6 +58,11 @@ src_unpack() {
src_compile() {
filter-flags -fomit-frame-pointer
+ export EXTLDFLAGS="${LDFLAGS}"
+
+ filter-flags -Wl,-Bdirect
+ filter-ldflags -Wl,-Bdirect
+ filter-ldflags -Bdirect
# Socks support via dante
if use socks5; then
@@ -85,7 +90,11 @@ src_compile() {
--with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \
|| die "econf failed"
- emake || die "emake failed"
+ emake EXTLDFLAGS="${EXTLDFLAGS}" DLDFLAGS="${LDFLAGS}" || die "emake failed"
+
+ # Remove the expanded ${LDFLAGS} variable on the configuration file
+ sed -i -e 's:CONFIG\["LDFLAGS"\] =.*:CONFIG["LDFLAGS"] = "-Wl,-export-dynamic":' \
+ rbconfig.rb
}
src_install() {