[DRE-commits] [gem2deb] 01/01: gem2deb/extension_builder.rb: make sure rake is called as /usr/bin/rake

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository gem2deb.

commit d2b19c125cfa1a317051da6c2b1dea49eaf12194
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Apr 26 18:47:42 2016 -0300

    gem2deb/extension_builder.rb: make sure rake is called as /usr/bin/rake
---
 debian/changelog                 | 1 +
 lib/gem2deb/extension_builder.rb | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 21d7ee7..91ef340 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ gem2deb (0.30.2) UNRELEASED; urgency=medium
   * gem2deb-test-runner:
     - make it explicit in the manpage that are options other than
       --autopkgtest
+  * gem2deb/extension_builder.rb: make sure rake is called as /usr/bin/rake
 
   [ Christian Hofstaedtler ]
   * Move build-essential to Recommends, easing cross-builds.
diff --git a/lib/gem2deb/extension_builder.rb b/lib/gem2deb/extension_builder.rb
index 1bb062a..47a454b 100644
--- a/lib/gem2deb/extension_builder.rb
+++ b/lib/gem2deb/extension_builder.rb
@@ -61,6 +61,10 @@ module Gem2Deb
         ENV['make'] ||= 'make'
         ENV['make'] += " V=1"
 
+        # make sure RakeBuilder uses the correct path to rake
+        env_rake_old = ENV['rake']
+        ENV['rake'] = '/usr/bin/rake'
+
         target = File.expand_path(File.join(destdir, RbConfig::CONFIG['vendorarchdir']))
         FileUtils.mkdir_p(target)
         Dir.chdir(directory) do
@@ -93,6 +97,7 @@ module Gem2Deb
         raise e
       ensure
         ENV['make']=env_make_old
+        ENV['rake']=env_rake_old
       end
     end
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gem2deb.git