diff options
author | Jackie Huang <jackie.huang@windriver.com> | 2014-08-11 22:26:14 -0400 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-08-13 23:28:05 +0200 |
commit | efea141c6e6e44ca48f3837e5c3383ccfe9ba247 (patch) | |
tree | 05edbbdff8e1534330ab778db8fce02712e3bd56 /meta-ruby/recipes-devtools | |
parent | ec2c365c40bb1f2eedccec41ba1ac3f4dd45c4b7 (diff) | |
download | meta-openembedded-contrib-efea141c6e6e44ca48f3837e5c3383ccfe9ba247.tar.gz |
ruby: fix race conditions at install-ext
* lib/mkmf.rb (create_makefile): fix race conditions at install-ext.
target files need to depend on destination directory timestamp
files, not phony trgets.
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-ruby/recipes-devtools')
-rw-r--r-- | meta-ruby/recipes-devtools/ruby/ruby/ruby-mkmf.rb-fix-race-conditions-at-install-ext.patch | 31 | ||||
-rw-r--r-- | meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p547.bb | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/meta-ruby/recipes-devtools/ruby/ruby/ruby-mkmf.rb-fix-race-conditions-at-install-ext.patch b/meta-ruby/recipes-devtools/ruby/ruby/ruby-mkmf.rb-fix-race-conditions-at-install-ext.patch new file mode 100644 index 0000000000..5ac5d54a3f --- /dev/null +++ b/meta-ruby/recipes-devtools/ruby/ruby/ruby-mkmf.rb-fix-race-conditions-at-install-ext.patch @@ -0,0 +1,31 @@ +Subject: [PATCH] mkmf.rb: fix race conditions at install-ext + +Upstream-Status: backport + +* lib/mkmf.rb (create_makefile): fix race conditions at install-ext. + target files need to depend on destination directory timestamp + files, not phony trgets. + +git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36863 b2dd03c8-39d4-4d8f-98ff-823fe69b080e + +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> +--- + lib/mkmf.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/mkmf.rb b/lib/mkmf.rb +index 556684c..a277354 100644 +--- a/lib/mkmf.rb ++++ b/lib/mkmf.rb +@@ -2055,7 +2055,7 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""} + for f in files + dest = "#{dir}/#{File.basename(f)}" + mfile.print("install-rb#{sfx}: #{dest}\n") +- mfile.print("#{dest}: #{f}\n") ++ mfile.print("#{dest}: #{f} #{timestamp_file(dir)}\n") + mfile.print("\t$(Q) $(#{$extout ? 'COPY' : 'INSTALL_DATA'}) #{f} $(@D#{sep})\n") + if defined?($installed_list) and !$extout + mfile.print("\t@echo #{dest}>>$(INSTALLED_LIST)\n") +-- +2.0.0 + diff --git a/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p547.bb b/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p547.bb index 24bacdc4ca..2d5938f874 100644 --- a/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p547.bb +++ b/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p547.bb @@ -11,6 +11,7 @@ SRC_URI += "\ file://ruby-1.9.3-mkmf-verbose.patch \ file://ruby-1.9.3-install-cross.patch \ file://remove-the-dependency-on-dir.patch \ + file://ruby-mkmf.rb-fix-race-conditions-at-install-ext.patch \ " SRC_URI[md5sum] = "7531f9b1b35b16f3eb3d7bea786babfd" SRC_URI[sha256sum] = "9ba118e4aba04c430bc4d5efb09b31a0277e101c9fd2ef3b80b9c684d7ae57a1" |