diff options
author | Jackie Huang <jackie.huang@windriver.com> | 2014-08-11 22:26:14 -0400 |
---|---|---|
committer | Cliff Brake <cbrake@bec-systems.com> | 2014-10-29 14:03:22 -0400 |
commit | 8065dd8456913457a0114ddb2b4bd4842847b2a3 (patch) | |
tree | cd3668cfb05dbfe5bcfb539f35aa2afecc9a82c6 | |
parent | 80764fddc4f6086a8941132ce36f23e79b2bf181 (diff) | |
download | meta-openembedded-8065dd8456913457a0114ddb2b4bd4842847b2a3.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>
Acked-by: Cliff Brake <cbrake@bec-systems.com>
-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-p429.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 000000000..5ac5d54a3 --- /dev/null +++ b/meta-ruby/recipes-devtools/ruby/ruby/ruby-mkmf.rb-fix-race-conditions-at-install-ext.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | Subject: [PATCH] mkmf.rb: fix race conditions at install-ext | ||
2 | |||
3 | Upstream-Status: backport | ||
4 | |||
5 | * lib/mkmf.rb (create_makefile): fix race conditions at install-ext. | ||
6 | target files need to depend on destination directory timestamp | ||
7 | files, not phony trgets. | ||
8 | |||
9 | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36863 b2dd03c8-39d4-4d8f-98ff-823fe69b080e | ||
10 | |||
11 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
12 | --- | ||
13 | lib/mkmf.rb | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/lib/mkmf.rb b/lib/mkmf.rb | ||
17 | index 556684c..a277354 100644 | ||
18 | --- a/lib/mkmf.rb | ||
19 | +++ b/lib/mkmf.rb | ||
20 | @@ -2055,7 +2055,7 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""} | ||
21 | for f in files | ||
22 | dest = "#{dir}/#{File.basename(f)}" | ||
23 | mfile.print("install-rb#{sfx}: #{dest}\n") | ||
24 | - mfile.print("#{dest}: #{f}\n") | ||
25 | + mfile.print("#{dest}: #{f} #{timestamp_file(dir)}\n") | ||
26 | mfile.print("\t$(Q) $(#{$extout ? 'COPY' : 'INSTALL_DATA'}) #{f} $(@D#{sep})\n") | ||
27 | if defined?($installed_list) and !$extout | ||
28 | mfile.print("\t@echo #{dest}>>$(INSTALLED_LIST)\n") | ||
29 | -- | ||
30 | 2.0.0 | ||
31 | |||
diff --git a/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p429.bb b/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p429.bb index 7610602dc..a57c89530 100644 --- a/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p429.bb +++ b/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p429.bb | |||
@@ -12,6 +12,7 @@ SRC_URI += "\ | |||
12 | file://ruby-1.9.3-mkmf-verbose.patch \ | 12 | file://ruby-1.9.3-mkmf-verbose.patch \ |
13 | file://ruby-1.9.3-install-cross.patch \ | 13 | file://ruby-1.9.3-install-cross.patch \ |
14 | file://remove-the-dependency-on-dir.patch \ | 14 | file://remove-the-dependency-on-dir.patch \ |
15 | file://ruby-mkmf.rb-fix-race-conditions-at-install-ext.patch \ | ||
15 | " | 16 | " |
16 | SRC_URI[md5sum] = "993c72f7f805a9eb453f90b0b7fe0d2b" | 17 | SRC_URI[md5sum] = "993c72f7f805a9eb453f90b0b7fe0d2b" |
17 | SRC_URI[sha256sum] = "d192d1afc46a7ef27b9d0a3c7a67b509048984db2c38907aa82641bdf980acf4" | 18 | SRC_URI[sha256sum] = "d192d1afc46a7ef27b9d0a3c7a67b509048984db2c38907aa82641bdf980acf4" |