kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

mkmf.rb: hack for -framework

Browse source 
* lib/mkmf.rb (have_framework): get rid of separating -framework
  option and its argument and dealing with the argument as a library
  or an object name.  if $LDFLAGS were an array...


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36437 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-07-18 07:17:43 +00:00
parent 5d743d7662
commit 5a03c25690
3 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Wed Jul 18 16:17:40 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (have_framework): get rid of separating -framework
option and its argument and dealing with the argument as a library
or an object name. if $LDFLAGS were an array...
Wed Jul 18 16:09:10 2012 Shugo Maeda <shugo@ruby-lang.org> Wed Jul 18 16:09:10 2012 Shugo Maeda <shugo@ruby-lang.org>
* ext/curses/extconf.rb: support PDCurses. patched by Luis Lavena. * ext/curses/extconf.rb: support PDCurses. patched by Luis Lavena.

2
ext/tk/extconf.rb
View file

@ -1995,7 +1995,7 @@ if TkLib_Config["tcltk-framework"]
end end
end end
end end
$LDFLAGS << ' ' << libs.gsub(/((?:\A|\s)-framework)\s/, '\1=') $LDFLAGS << ' ' << libs.gsub(/((?:\A|\s)-framework)\s/, "\\1\0")
$libs << ' -ltk -ltcl' $libs << ' -ltk -ltcl'
setup_for_macosx_framework(tclver, tkver) if tcl_cfg_dir && tk_cfg_dir setup_for_macosx_framework(tclver, tkver) if tcl_cfg_dir && tk_cfg_dir
end end

9
lib/mkmf.rb
View file

@ -1017,9 +1017,12 @@ SRC
def have_framework(fw, &b) def have_framework(fw, &b)
checking_for fw do checking_for fw do
src = cpp_include("#{fw}/#{fw}.h") << "\n" "int main(void){return 0;}" src = cpp_include("#{fw}/#{fw}.h") << "\n" "int main(void){return 0;}"
if try_link(src, opt = "-ObjC -framework #{fw}", &b) if try_link(src, "-ObjC -framework #{fw}", &b)
$defs.push(format("-DHAVE_FRAMEWORK_%s", fw.tr_cpp)) $defs.push(format("-DHAVE_FRAMEWORK_%s", fw.tr_cpp))
$LDFLAGS << " " << opt # TODO: non-worse way than this hack, to get rid of separating
# option and its argument.
opt = " -ObjC -framework\0#{fw}"
$LDFLAGS << opt
true true
else else
false false
@ -1794,7 +1797,7 @@ INCFLAGS = -I. #$INCFLAGS
DEFS = #{CONFIG['DEFS']} DEFS = #{CONFIG['DEFS']}
CPPFLAGS = #{extconf_h}#{$CPPFLAGS} CPPFLAGS = #{extconf_h}#{$CPPFLAGS}
CXXFLAGS = $(CFLAGS) #{CONFIG['CXXFLAGS']} CXXFLAGS = $(CFLAGS) #{CONFIG['CXXFLAGS']}
ldflags = #{$LDFLAGS} ldflags = #{$LDFLAGS.tr!("\0", " ")}
dldflags = #{$DLDFLAGS} #{CONFIG['EXTDLDFLAGS']} dldflags = #{$DLDFLAGS} #{CONFIG['EXTDLDFLAGS']}
ARCH_FLAG = #{$ARCH_FLAG} ARCH_FLAG = #{$ARCH_FLAG}
DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG) DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)