summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-09-06 16:21:57 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-09-06 16:21:57 +0000
commitd0d68df7d00f58c8ebb9a74f577dca389876d882 (patch)
tree2824ed0d734a16cb7a4d7cb30c1c45c05a03b293
parent977bec12363e7e87a19ad81aa063fbf2b4112493 (diff)
mkmf.rb: fix splitting options with an argument
* ext/extmk.rb (extmake), lib/mkmf.rb (have_framework): fix splitting options with an argument, not using NUL as special character. [ruby-core:47447] [Bug #6987] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36918 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rwxr-xr-xext/extmk.rb4
-rw-r--r--ext/tk/extconf.rb2
-rw-r--r--lib/mkmf.rb9
-rw-r--r--test/mkmf/test_framework.rb5
5 files changed, 20 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 17e5106..88edf06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Sep 7 01:21:51 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/extmk.rb (extmake), lib/mkmf.rb (have_framework): fix splitting
+ options with an argument, not using NUL as special character.
+ [ruby-core:47447] [Bug #6987]
+
Thu Sep 6 14:49:49 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* .gdbinit (rp): FLONUM support.
diff --git a/ext/extmk.rb b/ext/extmk.rb
index e3685d0..3082a00 100755
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -258,9 +258,9 @@ def extmake(target)
$extlibs ||= []
$extpath ||= []
unless $mswin
- $extflags = ($extflags.split | $DLDFLAGS.split | $LDFLAGS.split).join(" ")
+ $extflags = split_libs($extflags, $DLDFLAGS, $LDFLAGS).uniq.join(" ")
end
- $extlibs = merge_libs($extlibs, $libs.split(/\s+(?=-|\z)/), $LOCAL_LIBS.split(/\s+(?=-|\z)/))
+ $extlibs = merge_libs($extlibs, split_libs($libs), split_libs($LOCAL_LIBS))
$extpath |= $LIBPATH
end
ensure
diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb
index 778201c..72dd6cf 100644
--- a/ext/tk/extconf.rb
+++ b/ext/tk/extconf.rb
@@ -1995,7 +1995,7 @@ if TkLib_Config["tcltk-framework"]
end
end
end
- $LDFLAGS << ' ' << libs.gsub(/((?:\A|\s)-framework)\s/, "\\1\0")
+ $LDFLAGS << ' ' << libs
$libs << ' -ltk -ltcl'
setup_for_macosx_framework(tclver, tkver) if tcl_cfg_dir && tk_cfg_dir
end
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 39113b5..5a0d274 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -234,6 +234,10 @@ module MakeMakefile
t if times.all? {|n| n <= t}
end
+ def split_libs(*strs)
+ strs.map {|s| s.split(/\s+(?=-|\z)/)}.flatten
+ end
+
def merge_libs(*libs)
libs.inject([]) do |x, y|
xy = x & y
@@ -1018,11 +1022,10 @@ SRC
def have_framework(fw, &b)
checking_for fw do
src = cpp_include("#{fw}/#{fw}.h") << "\n" "int main(void){return 0;}"
- if try_link(src, "-ObjC -framework #{fw}", &b)
+ if try_link(src, opt = "-ObjC -framework #{fw}", &b)
$defs.push(format("-DHAVE_FRAMEWORK_%s", fw.tr_cpp))
# TODO: non-worse way than this hack, to get rid of separating
# option and its argument.
- opt = " -ObjC -framework\0#{fw}"
$LDFLAGS << opt
true
else
@@ -1804,7 +1807,7 @@ INCFLAGS = -I. #$INCFLAGS
DEFS = #{CONFIG['DEFS']}
CPPFLAGS = #{extconf_h}#{$CPPFLAGS}
CXXFLAGS = $(CFLAGS) #{CONFIG['CXXFLAGS']}
-ldflags = #{$LDFLAGS.tr("\0", " ")}
+ldflags = #{$LDFLAGS}
dldflags = #{$DLDFLAGS} #{CONFIG['EXTDLDFLAGS']}
ARCH_FLAG = #{$ARCH_FLAG}
DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
diff --git a/test/mkmf/test_framework.rb b/test/mkmf/test_framework.rb
index 12f60de..39171a0 100644
--- a/test/mkmf/test_framework.rb
+++ b/test/mkmf/test_framework.rb
@@ -5,5 +5,10 @@ class TestMkmf
def test_core_foundation_framework
assert(have_framework("CoreFoundation"), mkmflog("try as Objective-C"))
end
+
+ def test_multi_frameworks
+ assert(have_framework("CoreFoundation"), mkmflog("try as Objective-C"))
+ assert(have_framework("Cocoa"), mkmflog("try as Objective-C"))
+ end
end
end if /darwin/ =~ RUBY_PLATFORM