Blame ruby-2.1.0-test_config.rb-fix-library-path.patch
|
 |
a03b2d2 |
From cf26cdec7bcd0668b8f8347a5f29072c8b8f6e8d Mon Sep 17 00:00:00 2001
|
|
|
a03b2d2 |
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
|
|
|
a03b2d2 |
Date: Tue, 1 Oct 2013 11:36:47 +0000
|
|
|
a03b2d2 |
Subject: [PATCH] test_config.rb: fix library path
|
|
|
a03b2d2 |
|
|
|
a03b2d2 |
* test/mkmf/test_config.rb (test_dir_config): fix expected library
|
|
|
a03b2d2 |
path. [ruby-core:57535] [Bug #8972]
|
|
|
a03b2d2 |
|
|
|
a03b2d2 |
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43106 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
|
|
|
a03b2d2 |
---
|
|
|
a03b2d2 |
test/mkmf/test_config.rb | 3 ++-
|
|
|
a03b2d2 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
a03b2d2 |
|
|
|
a03b2d2 |
diff --git a/test/mkmf/test_config.rb b/test/mkmf/test_config.rb
|
|
|
a03b2d2 |
index b09dfd6..4a9be57 100644
|
|
|
a03b2d2 |
--- a/test/mkmf/test_config.rb
|
|
|
a03b2d2 |
+++ b/test/mkmf/test_config.rb
|
|
|
a03b2d2 |
@@ -8,8 +8,9 @@ class TestMkmf < Test::Unit::TestCase
|
|
|
a03b2d2 |
class TestConfig < Test::Unit::TestCase
|
|
|
a03b2d2 |
def test_dir_config
|
|
|
a03b2d2 |
bug8074 = '[Bug #8074]'
|
|
|
a03b2d2 |
+ lib = RbConfig.expand(RbConfig::MAKEFILE_CONFIG["libdir"], "exec_prefix"=>"")
|
|
|
a03b2d2 |
assert_separately %w[-rmkmf - -- --with-foo-dir=/test/foo], %{
|
|
|
a03b2d2 |
- assert_equal(%w[/test/foo/include /test/foo/lib], dir_config("foo"), #{bug8074.dump})
|
|
|
a03b2d2 |
+ assert_equal(%w[/test/foo/include /test/foo#{lib}], dir_config("foo"), #{bug8074.dump})
|
|
|
a03b2d2 |
}
|
|
|
a03b2d2 |
end
|
|
|
a03b2d2 |
end
|
|
|
a03b2d2 |
--
|
|
|
a03b2d2 |
1.8.3.1
|
|
|
a03b2d2 |
|