mini_portile 0.2.1 → 0.2.2

data/History.txt

@@ -1,3 +1,11 @@
+=== 0.2.2 / 2011-04-11
+
+* Minor enhancements:
+  * Use LDFLAGS when activating recipes for cross-compilation. Closes #6
+
+* Bugfixes:
+  * Remove memoization of *_path helpers. Closes #7
+
 === 0.2.1 / 2011-04-06
 
 * Minor enhancements:

data/Rakefile

@@ -4,7 +4,7 @@ require "rubygems/package_task"
 GEM_SPEC = Gem::Specification.new do |s|
   # basic information
   s.name        = "mini_portile"
-  s.version     = "0.2.1"
+  s.version     = "0.2.2"
   s.platform    = Gem::Platform::RUBY
 
   # description and details

data/examples/Rakefile

@@ -43,6 +43,7 @@ namespace :ports do
     $recipes.each do |_, recipe|
       puts "Artifacts of '#{recipe.name}' in '#{recipe.path}'"
     end
+    puts "LDFLAGS: " << ENV['LDFLAGS'].inspect
   end
 end
 

data/lib/mini_portile.rb

@@ -5,7 +5,7 @@ require 'tempfile'
 require 'digest/md5'
 
 class MiniPortile
-  attr_reader :name, :version
+  attr_reader :name, :version, :original_host
   attr_writer :configure_options
   attr_accessor :host, :files, :target, :logger
 
@@ -16,7 +16,7 @@ class MiniPortile
     @files = []
     @logger = STDOUT
 
-    @host = RbConfig::CONFIG['arch']
+    @original_host = @host = RbConfig::CONFIG['arch']
   end
 
   def download
@@ -94,10 +94,11 @@ class MiniPortile
   end
 
   def activate
+    lib_path = File.join(port_path, "lib")
     vars = {
       'PATH'          => File.join(port_path, 'bin'),
       'CPATH'         => File.join(port_path, 'include'),
-      'LIBRARY_PATH'  => File.join(port_path, 'lib')
+      'LIBRARY_PATH'  => lib_path
     }.reject { |env, path| !File.directory?(path) }
 
     output "Activating #{@name} #{@version} (from #{port_path})..."
@@ -114,6 +115,17 @@ class MiniPortile
         ENV[var] = "#{full_path}#{File::PATH_SEPARATOR}#{old_value}"
       end
     end
+
+    # rely on LDFLAGS when cross-compiling
+    if File.exist?(lib_path) && (@host != @original_host)
+      full_path = File.expand_path(lib_path)
+
+      old_value = ENV.fetch("LDFLAGS", "")
+
+      unless old_value.include?(full_path)
+        ENV["LDFLAGS"] = "-L#{full_path} #{old_value}".strip
+      end
+    end
   end
 
   def path
@@ -123,21 +135,19 @@ class MiniPortile
 private
 
   def tmp_path
-    @tmp_path ||= "tmp/#{@host}/ports/#{@name}/#{@version}"
+    "tmp/#{@host}/ports/#{@name}/#{@version}"
   end
 
   def port_path
-    @port_path ||= "#{@target}/#{@host}/#{@name}/#{@version}"
+    "#{@target}/#{@host}/#{@name}/#{@version}"
   end
 
   def archives_path
-    @archives_path ||= "#{@target}/archives"
+    "#{@target}/archives"
   end
 
   def work_path
-    @work_path ||= begin
-      Dir.glob("#{tmp_path}/*").find { |d| File.directory?(d) }
-    end
+    Dir.glob("#{tmp_path}/*").find { |d| File.directory?(d) }
   end
 
   def configure_defaults

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mini_portile
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Luis Lavena
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 -03:00
+date: 2011-04-11 00:00:00 -03:00
 default_executable: 
 dependencies: []