Gentoo Archives: gentoo-commits

From: "Diego Petteno (flameeyes)" <flameeyes@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: ruby-ng.eclass
Date: Fri, 30 Jul 2010 18:02:17
Message-Id: 20100730172854.09E502CE15@corvid.gentoo.org
1 flameeyes 10/07/30 17:28:53
2
3 Modified: ruby-ng.eclass
4 Log:
5 Ignore basename errors, they happen with JRuby since it lacks a soname.
6
7 Revision Changes Path
8 1.25 eclass/ruby-ng.eclass
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-ng.eclass?rev=1.25&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-ng.eclass?rev=1.25&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-ng.eclass?r1=1.24&r2=1.25
13
14 Index: ruby-ng.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v
17 retrieving revision 1.24
18 retrieving revision 1.25
19 diff -u -r1.24 -r1.25
20 --- ruby-ng.eclass 30 Jul 2010 16:56:21 -0000 1.24
21 +++ ruby-ng.eclass 30 Jul 2010 17:28:53 -0000 1.25
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.24 2010/07/30 16:56:21 flameeyes Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.25 2010/07/30 17:28:53 flameeyes Exp $
27 #
28 # @ECLASS: ruby-ng.eclass
29 # @MAINTAINER:
30 @@ -398,7 +398,7 @@
31 has "${EAPI}" 2 && ! use prefix && EPREFIX=
32
33 local libruby_basename=$(${RUBY} -rrbconfig -e 'puts Config::CONFIG["LIBRUBY_SO"]')
34 - local libruby_soname=$(basename $(${scancmd} -F "%S#F" -qS "${EPREFIX}/usr/$(get_libdir)/${libruby_basename}"))
35 + local libruby_soname=$(basename $(${scancmd} -F "%S#F" -qS "${EPREFIX}/usr/$(get_libdir)/${libruby_basename}") 2>/dev/null)
36 local sitedir=$(${RUBY} -rrbconfig -e 'puts Config::CONFIG["sitedir"]')
37 local sitelibdir=$(${RUBY} -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')