summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/ruby/ruby/0001-extmk-fix-cross-compilation-of-external-gems.patch
diff options
context:
space:
mode:
authorAndré Draszik <andre.draszik@jci.com>2019-10-01 10:54:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-23 16:30:36 +0100
commit7fef74ae95bc8d4342b06974f6a651b5ded81054 (patch)
treebcc9ab5df4382bef931a14df9ebd6d39d878be8b /meta/recipes-devtools/ruby/ruby/0001-extmk-fix-cross-compilation-of-external-gems.patch
parentf82f4fae7effbf178065deed3934aec3fbf5b8b7 (diff)
downloadpoky-7fef74ae95bc8d4342b06974f6a651b5ded81054.tar.gz
ruby: update to v2.6.4
Most patches had to be refreshed Note that we can now drop EXTRA_AUTORECONF += "--exclude=aclocal" from the recipe, as ruby upstream now fully supports runnning aclocal: https://github.com/ruby/ruby/pull/1793/commits/df9bf70cd2275a3ddc3108f392214fcc4a9b0859 https://github.com/ruby/ruby/commit/ec43478f34de262ebdd2922c488e265344b489c3 Also note that 'created.rid' is not being installed anymore since v2.6.0 While additional LICENSEs were added to the recipe, they should always have been mentioned in this recipe, i.e. the license checksum was updated only because: * URLs were updated * new imported components were mentioned (with no new licenses) * formatting was changed * dates were updated (From OE-Core rev: 7124051b3b2e91e81c7b8565104ae9c5bea10be1) Signed-off-by: André Draszik <andre.draszik@jci.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/ruby/ruby/0001-extmk-fix-cross-compilation-of-external-gems.patch')
-rw-r--r--meta/recipes-devtools/ruby/ruby/0001-extmk-fix-cross-compilation-of-external-gems.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-devtools/ruby/ruby/0001-extmk-fix-cross-compilation-of-external-gems.patch b/meta/recipes-devtools/ruby/ruby/0001-extmk-fix-cross-compilation-of-external-gems.patch
new file mode 100644
index 0000000000..2e3156880e
--- /dev/null
+++ b/meta/recipes-devtools/ruby/ruby/0001-extmk-fix-cross-compilation-of-external-gems.patch
@@ -0,0 +1,34 @@
1From a6e12b25a54d112c899b70c89c0bec9c5e5ebf3c Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Mon, 30 Sep 2019 16:57:01 +0100
4Subject: [PATCH 1/3] extmk: fix cross-compilation of external gems
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Note that I (André) didn't actually write this patch, I
10only updated it so that git-am works.
11
12Upstream-Status: Pending
13Signed-off-by: André Draszik <andre.draszik@jci.com>
14---
15 ext/extmk.rb | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/ext/extmk.rb b/ext/extmk.rb
19index 1389dc4117..e4d923d7a7 100755
20--- a/ext/extmk.rb
21+++ b/ext/extmk.rb
22@@ -413,8 +413,8 @@ def $mflags.defined?(var)
23 end
24 $ruby = [$ruby]
25 $ruby << "-I'$(topdir)'"
26+$ruby << "-I'$(top_srcdir)/lib'"
27 unless CROSS_COMPILING
28- $ruby << "-I'$(top_srcdir)/lib'"
29 $ruby << "-I'$(extout)/$(arch)'" << "-I'$(extout)/common'" if $extout
30 ENV["RUBYLIB"] = "-"
31 end
32--
332.23.0.rc1
34