From: | "Alex Legler (a3li)" <a3li@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in eclass: ruby-ng.eclass |
Date: | Fri, 02 Apr 2010 20:26:23 |
Message-Id: | E1NxnRd-0007w9-TJ@stork.gentoo.org |
1 | a3li 10/04/02 20:26:21 |
2 | |
3 | Modified: ruby-ng.eclass |
4 | Log: |
5 | ruby-ng.eclass: Add support for targets with different flag and executable names. Implement this feature for Ruby Enterprise Edition 1.8. |
6 | |
7 | Revision Changes Path |
8 | 1.9 eclass/ruby-ng.eclass |
9 | |
10 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ruby-ng.eclass?rev=1.9&view=markup |
11 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ruby-ng.eclass?rev=1.9&content-type=text/plain |
12 | diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ruby-ng.eclass?r1=1.8&r2=1.9 |
13 | |
14 | Index: ruby-ng.eclass |
15 | =================================================================== |
16 | RCS file: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v |
17 | retrieving revision 1.8 |
18 | retrieving revision 1.9 |
19 | diff -u -r1.8 -r1.9 |
20 | --- ruby-ng.eclass 15 Jan 2010 12:58:20 -0000 1.8 |
21 | +++ ruby-ng.eclass 2 Apr 2010 20:26:21 -0000 1.9 |
22 | @@ -1,6 +1,6 @@ |
23 | # Copyright 1999-2009 Gentoo Foundation |
24 | # Distributed under the terms of the GNU General Public License v2 |
25 | -# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.8 2010/01/15 12:58:20 flameeyes Exp $ |
26 | +# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.9 2010/04/02 20:26:21 a3li Exp $ |
27 | # |
28 | # @ECLASS: ruby-ng.eclass |
29 | # @MAINTAINER: |
30 | @@ -244,7 +244,16 @@ |
31 | # only proceed if it's requested |
32 | use ruby_targets_${_ruby_implementation} || continue |
33 | |
34 | - RUBY=$(type -p $_ruby_implementation 2>/dev/null) |
35 | + local _ruby_name=$_ruby_implementation |
36 | + |
37 | + # Add all USE_RUBY values where the flag name diverts from the binary here |
38 | + case $_ruby_implementation in |
39 | + ree18) |
40 | + _ruby_name=rubyee18 |
41 | + ;; |
42 | + esac |
43 | + |
44 | + RUBY=$(type -p $_ruby_name 2>/dev/null) |
45 | invoked=yes |
46 | |
47 | if [[ -n "$1" ]]; then |