[gentoo-commits] gentoo-x86 commit in eclass: ruby-ng.eclass

["Diego Petteno (flameeyes)" <flameeyes@gentoo.org>]

flameeyes    10/07/30 15:05:08

  Modified:             ruby-ng.eclass
  Log:
  Fix broken test for mislink with the new Ruby 1.9.2 ebuilds.
  
  With 1.9.2 the sitedir is now the same between 1.8 and 1.9, so you
  cannot just go look for all the extensions within that or you'll hit
  the one for the other implementation as well. Instead use the
  sitelibdir that encodes the version as well.
  
  While at it, extend the test to the Gems-installed extensions, and
  remove an awk call by using the --format option of scanelf.

Revision  Changes    Path
1.23                 eclass/ruby-ng.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-ng.eclass?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-ng.eclass?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-ng.eclass?r1=1.22&r2=1.23

Index: ruby-ng.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ruby-ng.eclass	14 Jul 2010 13:11:51 -0000	1.22
+++ ruby-ng.eclass	30 Jul 2010 15:05:08 -0000	1.23
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.22 2010/07/14 13:11:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.23 2010/07/30 15:05:08 flameeyes Exp $
 #
 # @ECLASS: ruby-ng.eclass
 # @MAINTAINER:
@@ -392,7 +392,7 @@
 
 _each_ruby_check_install() {
 	local libruby_basename=$(${RUBY} -rrbconfig -e 'puts Config::CONFIG["LIBRUBY_SO"]')
-	local libruby_soname=$(scanelf -qS "/usr/$(get_libdir)/${libruby_basename}" | awk '{ print $1 }')
+	local libruby_soname=$(scanelf -F "%S#F" -qS "/usr/$(get_libdir)/${libruby_basename}")
 	local sitedir=$(${RUBY} -rrbconfig -e 'puts Config::CONFIG["sitedir"]')
 	local sitelibdir=$(${RUBY} -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
 
@@ -409,7 +409,11 @@
 	# The current implementation lacks libruby (i.e.: jruby)
 	[[ -z ${libruby_soname} ]] && return 0
 
-	scanelf -qnR "${D}${sitedir}" \
+	# Check also the gems directory, since we could be installing compiled
+	# extensions via ruby-fakegem; make sure to check only in sitelibdir, since
+	# that's what changes between two implementations (otherwise you'd get false
+	# positives now that Ruby 1.9.2 installs with the same sitedir as 1.8)
+	scanelf -qnR "${D}${sitelibdir}" "${D}${sitelibdir/site_ruby/gems}" \
 		| fgrep -v "${libruby_soname}" \
 		> "${T}"/ruby-ng-${_ruby_implementation}-mislink.log