1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/psych/extconf.rb: copy sources into build directory,

Browse Source 
not into srcdir.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37923 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2012-11-28 05:52:11 +00:00
parent 835d24f637
commit 1ff0a3d0c6
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Nov 28 14:50:55 2012 Koichi Sasada <ko1@atdot.net>
* ext/psych/extconf.rb: copy sources into build directory,
not into srcdir.
Wed Nov 28 14:34:06 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com> Wed Nov 28 14:34:06 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* thread.c (rb_mutex_lock): moved trap context check from * thread.c (rb_mutex_lock): moved trap context check from

9
ext/psych/extconf.rb
View File

@ -11,11 +11,16 @@ unless find_header('yaml.h') && find_library('yaml', 'yaml_get_version')
srcdir = File.expand_path File.dirname __FILE__ srcdir = File.expand_path File.dirname __FILE__
files = Dir.chdir File.join(srcdir, 'yaml') do files = Dir.chdir File.join(srcdir, 'yaml') do
Dir.entries(Dir.pwd).find_all { |f| Dir.entries(Dir.pwd).find_all { |f|
File.file?(f) && File.extname(f) =~ /^\.[hc]/ File.file?(f) && /^\.[hc]/ =~ File.extname(f)
}.map { |f| File.expand_path f } }.map { |f| File.expand_path f }
end end
FileUtils.cp_r files, srcdir dstdir = Dir.pwd
FileUtils.cp_r files, dstdir
$objs = (Dir.glob(File.join(File.dirname(__FILE__), '*.c')) + Dir.glob('*.c')).map{|f|
File.basename(f, '.c') + ".#{$OBJEXT}"
}
if $mswin if $mswin
$CFLAGS += " -DYAML_DECLARE_STATIC -DHAVE_CONFIG_H" $CFLAGS += " -DYAML_DECLARE_STATIC -DHAVE_CONFIG_H"