diff options
| author |   Nguyen Thai Ngoc Duy <pclouds@gentoo.org> | 2007-01-29 12:15:50 +0000 |
|---|---|---|
| committer | Nguyen Thai Ngoc Duy <pclouds@gentoo.org> | 2007-01-29 12:15:50 +0000 |
| commit | 0095a33f6248db9b2c5c9c6f329f331cf8222a40 (patch) | |
| tree | 04a136f8efd03e34fc8e8aa33537e28e6b47c4d4 /eclass | |
| parent | stable x86; bug #164079 (diff) | |
| download | gentoo-2-0095a33f6248db9b2c5c9c6f329f331cf8222a40.tar.gz gentoo-2-0095a33f6248db9b2c5c9c6f329f331cf8222a40.tar.bz2 gentoo-2-0095a33f6248db9b2c5c9c6f329f331cf8222a40.zip | |
Separating mkmf patching code and reuse it in gems.eclass
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/gems.eclass | 3 | ||||
| -rw-r--r-- | eclass/ruby.eclass | 11 |
2 files changed, 10 insertions, 4 deletions
diff --git a/eclass/gems.eclass b/eclass/gems.eclass index 58302696d165..5c2381ea9383 100644 --- a/eclass/gems.eclass +++ b/eclass/gems.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/gems.eclass,v 1.14 2007/01/09 23:29:17 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gems.eclass,v 1.15 2007/01/29 12:15:50 pclouds Exp $ # # Author: Rob Cakebread <pythonhead@gentoo.org> # Current Maintainer: Ruby Herd <ruby@gentoo.org> @@ -37,6 +37,7 @@ gems_location() { } gems_src_unpack() { + ruby_patch_mkmf true } diff --git a/eclass/ruby.eclass b/eclass/ruby.eclass index e11aa5c56338..792e27e42917 100644 --- a/eclass/ruby.eclass +++ b/eclass/ruby.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ruby.eclass,v 1.60 2007/01/26 16:03:48 pclouds Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ruby.eclass,v 1.61 2007/01/29 12:15:50 pclouds Exp $ # # Author: Mamoru KOMACHI <usata@gentoo.org> # @@ -53,13 +53,14 @@ fi [[ -z "${RUBY}" ]] && export RUBY=/usr/bin/ruby -ruby_src_unpack() { +ruby_patch_mkmf() { if [ ! -x /bin/install -a -x /usr/bin/install ]; then + einfo "Patching mkmf" cat <<END >${T}/mkmf.rb require 'mkmf' -STDERR.puts 'patching mkmf' +STDERR.puts 'Modified mkmf is used' CONFIG['INSTALL'] = '/usr/bin/install' END # save it because rubygems needs it (for unsetting RUBYOPT) @@ -67,6 +68,10 @@ END export RUBYOPT="${RUBYOPT} ${GENTOO_RUBYOPT}" fi +} + +ruby_src_unpack() { + ruby_patch_mkmf unpack ${A} cd ${S} # apply bulk patches |