summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2005-12-07 11:25:34 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2005-12-07 11:25:34 +0000
commitc4b0ee8188d55cb9235b958d1938481a852b9b7e (patch)
tree8b10a89c530d1e908bf160e05a002cc96e361623 /dev-lang
parentBump for 7.0RC3. (diff)
downloadgentoo-2-c4b0ee8188d55cb9235b958d1938481a852b9b7e.tar.gz
gentoo-2-c4b0ee8188d55cb9235b958d1938481a852b9b7e.tar.bz2
gentoo-2-c4b0ee8188d55cb9235b958d1938481a852b9b7e.zip
Make it multilib-strict capable. It might not be 100% complete for non-symlinked profiles, yet, as it installs arch-independent extensions in lib64, but currently there's no other way to improve this (sharing the site-independent directory would trigger collision-protect when two different ABI are installed for the same package, for the independent files, like headers). Closes bug #89985. No-change for non-multilib users.
(Portage version: 2.0.53)
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/ruby/ChangeLog10
-rw-r--r--dev-lang/ruby/ruby-1.8.4_pre2.ebuild6
2 files changed, 13 insertions, 3 deletions
diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 2bf5711ef046..86a725a1c738 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for dev-lang/ruby
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.169 2005/12/04 03:04:05 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.170 2005/12/07 11:25:34 flameeyes Exp $
+
+ 07 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> ruby-1.8.4_pre2.ebuild:
+ Make it multilib-strict capable. It might not be 100% complete for
+ non-symlinked profiles, yet, as it installs arch-independent extensions in
+ lib64, but currently there's no other way to improve this (sharing the
+ site-independent directory would trigger collision-protect when two
+ different ABI are installed for the same package, for the independent files,
+ like headers). Closes bug #89985. No-change for non-multilib users.
04 Dec 2005; Mamoru KOMACHI <usata@gentoo.org> ruby-1.8.3.ebuild,
ruby-1.8.4_pre2.ebuild:
diff --git a/dev-lang/ruby/ruby-1.8.4_pre2.ebuild b/dev-lang/ruby/ruby-1.8.4_pre2.ebuild
index 16e47de9db91..4e64e26952ca 100644
--- a/dev-lang/ruby/ruby-1.8.4_pre2.ebuild
+++ b/dev-lang/ruby/ruby-1.8.4_pre2.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2005 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_pre2.ebuild,v 1.2 2005/12/04 03:04:05 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.4_pre2.ebuild,v 1.3 2005/12/07 11:25:34 flameeyes Exp $
ONIGURUMA="onigd2_5_0"
-inherit flag-o-matic alternatives eutils gnuconfig
+inherit flag-o-matic alternatives eutils gnuconfig multilib
DESCRIPTION="An object-oriented scripting language"
HOMEPAGE="http://www.ruby-lang.org/"
@@ -81,7 +81,9 @@ src_compile() {
$(use_enable socks5 socks) \
$(use_enable doc install-doc) \
$(use_enable threads pthread) \
+ --with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \
|| die "econf failed"
+
emake || die "emake failed"
}