diff options
author | Wang Mingyu <wangmy@cn.fujitsu.com> | 2020-02-12 10:35:06 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-15 10:26:42 +0000 |
commit | 717ba0a25669f469c7698399a79ad21661324edc (patch) | |
tree | 7e3117fcaaa7b2a4dc324416d87baaba87b46056 /meta | |
parent | f4b77888144cbcb0fcf851544ee73b81d92f234a (diff) | |
download | poky-717ba0a25669f469c7698399a79ad21661324edc.tar.gz |
ruby: upgrade 2.6.5 -> 2.7.0
0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch
Removed since it is included in 2.7.0.
refresh the following patch:
0002-Obey-LDFLAGS-for-the-link-of-libruby.patch
add the following patch to solve build error:
0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch
[error message]
ERROR: ruby-2.7.0-r0 do_package_qa: QA Issue:
/usr/lib/ruby/gems/2.7.0/gems/racc-1.4.16/bin/y2racc contained in
package ruby requires /usr/local/bin/ruby, but no providers found in
RDEPENDS_ruby? [file-rdeps]
format of file COPYING is updated.
LEGAL notice information is updated.
(From OE-Core rev: 3cdf5da514b424a6d78ba4e1412331b6cf2b3bff)
Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/ruby/ruby.inc | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch | 38 | ||||
-rw-r--r-- | meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch | 8 | ||||
-rw-r--r-- | meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch | 103 | ||||
-rw-r--r-- | meta/recipes-devtools/ruby/ruby_2.7.0.bb (renamed from meta/recipes-devtools/ruby/ruby_2.6.5.bb) | 6 |
5 files changed, 47 insertions, 112 deletions
diff --git a/meta/recipes-devtools/ruby/ruby.inc b/meta/recipes-devtools/ruby/ruby.inc index ce1b02f012..a38b3fe624 100644 --- a/meta/recipes-devtools/ruby/ruby.inc +++ b/meta/recipes-devtools/ruby/ruby.inc | |||
@@ -8,10 +8,10 @@ HOMEPAGE = "http://www.ruby-lang.org/" | |||
8 | SECTION = "devel/ruby" | 8 | SECTION = "devel/ruby" |
9 | LICENSE = "Ruby | BSD-2-Clause | BSD-3-Clause | GPLv2 | ISC | MIT" | 9 | LICENSE = "Ruby | BSD-2-Clause | BSD-3-Clause | GPLv2 | ISC | MIT" |
10 | LIC_FILES_CHKSUM = "\ | 10 | LIC_FILES_CHKSUM = "\ |
11 | file://COPYING;md5=340948e1882e579731841bf49cdc22c1 \ | 11 | file://COPYING;md5=5b8c87559868796979806100db3f3805 \ |
12 | file://BSDL;md5=19aaf65c88a40b508d17ae4be539c4b5\ | 12 | file://BSDL;md5=19aaf65c88a40b508d17ae4be539c4b5\ |
13 | file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263\ | 13 | file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263\ |
14 | file://LEGAL;md5=4ac0b84d1f7f420bca282e1adefc7f99 \ | 14 | file://LEGAL;md5=2b6d62dc0d608f34d510ca3f428110ec \ |
15 | " | 15 | " |
16 | 16 | ||
17 | DEPENDS = "ruby-native zlib openssl tcl libyaml gdbm readline libffi" | 17 | DEPENDS = "ruby-native zlib openssl tcl libyaml gdbm readline libffi" |
diff --git a/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch b/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch new file mode 100644 index 0000000000..f316bed7bd --- /dev/null +++ b/meta/recipes-devtools/ruby/ruby/0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From eed7bc855fd8d232d4d203cc9027dd07cee8eca2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Wang Mingyu <wangmy@cn.fujitsu.com> | ||
3 | Date: Sat, 8 Feb 2020 15:16:14 +0800 | ||
4 | Subject: [PATCH] Modify shebang of libexec/y2racc and libexec/racc2y. | ||
5 | |||
6 | change /usr/local/bin/ruby to /usr/bin/env ruby. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> | ||
11 | --- | ||
12 | libexec/racc2y | 2 +- | ||
13 | libexec/y2racc | 2 +- | ||
14 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/libexec/racc2y b/libexec/racc2y | ||
17 | index f88d73ed2c..74e49cfa21 100755 | ||
18 | --- a/libexec/racc2y | ||
19 | +++ b/libexec/racc2y | ||
20 | @@ -1,4 +1,4 @@ | ||
21 | -#!/usr/local/bin/ruby | ||
22 | +#!/usr/bin/env ruby | ||
23 | # | ||
24 | # $Id$ | ||
25 | # | ||
26 | diff --git a/libexec/y2racc b/libexec/y2racc | ||
27 | index 7933f94153..36daf864e1 100755 | ||
28 | --- a/libexec/y2racc | ||
29 | +++ b/libexec/y2racc | ||
30 | @@ -1,4 +1,4 @@ | ||
31 | -#!/usr/local/bin/ruby | ||
32 | +#!/usr/bin/env ruby | ||
33 | # | ||
34 | # $Id$ | ||
35 | # | ||
36 | -- | ||
37 | 2.17.1 | ||
38 | |||
diff --git a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch index 5979d8bd73..b31dee1128 100644 --- a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch +++ b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch | |||
@@ -6,13 +6,13 @@ Subject: [PATCH 2/3] Obey LDFLAGS for the link of libruby | |||
6 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> | 6 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> |
7 | Upstream-Status: Pending | 7 | Upstream-Status: Pending |
8 | --- | 8 | --- |
9 | Makefile.in | 2 +- | 9 | template/Makefile.in | 2 +- |
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
11 | 11 | ||
12 | diff --git a/Makefile.in b/Makefile.in | 12 | diff --git a/template/Makefile.in b/template/Makefile.in |
13 | index fa1e19ef37..bbd07fa34b 100644 | 13 | index fa1e19ef37..bbd07fa34b 100644 |
14 | --- a/Makefile.in | 14 | --- a/template/Makefile.in |
15 | +++ b/Makefile.in | 15 | +++ b/template/Makefile.in |
16 | @@ -109,7 +109,7 @@ MISSING = @LIBOBJS@ @ALLOCA@ | 16 | @@ -109,7 +109,7 @@ MISSING = @LIBOBJS@ @ALLOCA@ |
17 | ENABLE_SHARED = @ENABLE_SHARED@ | 17 | ENABLE_SHARED = @ENABLE_SHARED@ |
18 | LDSHARED = @LIBRUBY_LDSHARED@ | 18 | LDSHARED = @LIBRUBY_LDSHARED@ |
diff --git a/meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch b/meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch deleted file mode 100644 index 1a8cff3e8c..0000000000 --- a/meta/recipes-devtools/ruby/ruby/0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch +++ /dev/null | |||
@@ -1,103 +0,0 @@ | |||
1 | From bd71b698bf733e6e93282cd2b1b93f51e1a33c7c Mon Sep 17 00:00:00 2001 | ||
2 | From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | ||
3 | Date: Fri, 8 Feb 2019 07:22:55 +0000 | ||
4 | Subject: [PATCH 3/3] configure.ac: check finite,isinf,isnan as macros first | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | [ruby-core:91487] [Bug #15595] | ||
10 | |||
11 | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67036 b2dd03c8-39d4-4d8f-98ff-823fe69b080e | ||
12 | |||
13 | --- | ||
14 | Upstream-Status: Backport [https://github.com/ruby/ruby/commit/74f94b3e6ebf15b76f3b357e754095412b006e94] | ||
15 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
16 | --- | ||
17 | aclocal.m4 | 1 + | ||
18 | configure.ac | 13 ++++--------- | ||
19 | tool/m4/ruby_replace_funcs.m4 | 13 +++++++++++++ | ||
20 | 3 files changed, 18 insertions(+), 9 deletions(-) | ||
21 | create mode 100644 tool/m4/ruby_replace_funcs.m4 | ||
22 | |||
23 | diff --git a/aclocal.m4 b/aclocal.m4 | ||
24 | index b0fe3eb959..ed7d14ef63 100644 | ||
25 | --- a/aclocal.m4 | ||
26 | +++ b/aclocal.m4 | ||
27 | @@ -35,6 +35,7 @@ m4_include([tool/m4/ruby_func_attribute.m4]) | ||
28 | m4_include([tool/m4/ruby_mingw32.m4]) | ||
29 | m4_include([tool/m4/ruby_prepend_option.m4]) | ||
30 | m4_include([tool/m4/ruby_prog_gnu_ld.m4]) | ||
31 | +m4_include([tool/m4/ruby_replace_funcs.m4]) | ||
32 | m4_include([tool/m4/ruby_replace_type.m4]) | ||
33 | m4_include([tool/m4/ruby_rm_recursive.m4]) | ||
34 | m4_include([tool/m4/ruby_setjmp_type.m4]) | ||
35 | diff --git a/configure.ac b/configure.ac | ||
36 | index 2c4d2888d2..2691da6a3c 100644 | ||
37 | --- a/configure.ac | ||
38 | +++ b/configure.ac | ||
39 | @@ -946,9 +946,6 @@ main() | ||
40 | ac_cv_func_fsync=yes | ||
41 | ac_cv_func_seekdir=yes | ||
42 | ac_cv_func_telldir=yes | ||
43 | - ac_cv_func_isinf=yes | ||
44 | - ac_cv_func_isnan=yes | ||
45 | - ac_cv_func_finite=yes | ||
46 | ac_cv_func_lchown=yes | ||
47 | ac_cv_func_link=yes | ||
48 | ac_cv_func_readlink=yes | ||
49 | @@ -999,9 +996,6 @@ main() | ||
50 | [netbsd*], [ LIBS="-lm $LIBS" | ||
51 | ], | ||
52 | [dragonfly*], [ LIBS="-lm $LIBS" | ||
53 | - # isinf() and isnan() are macros on DragonFly. | ||
54 | - ac_cv_func_isinf=yes | ||
55 | - ac_cv_func_isnan=yes | ||
56 | ], | ||
57 | [aix*],[ LIBS="-lm $LIBS" | ||
58 | ac_cv_func_round=no | ||
59 | @@ -1724,11 +1718,8 @@ AC_REPLACE_FUNCS(dup2) | ||
60 | AC_REPLACE_FUNCS(erf) | ||
61 | AC_REPLACE_FUNCS(explicit_bzero) | ||
62 | AC_REPLACE_FUNCS(ffs) | ||
63 | -AC_REPLACE_FUNCS(finite) | ||
64 | AC_REPLACE_FUNCS(flock) | ||
65 | AC_REPLACE_FUNCS(hypot) | ||
66 | -AC_REPLACE_FUNCS(isinf) | ||
67 | -AC_REPLACE_FUNCS(isnan) | ||
68 | AC_REPLACE_FUNCS(lgamma_r) | ||
69 | AC_REPLACE_FUNCS(memmove) | ||
70 | AC_REPLACE_FUNCS(nan) | ||
71 | @@ -1741,6 +1732,10 @@ AC_REPLACE_FUNCS(strlcpy) | ||
72 | AC_REPLACE_FUNCS(strstr) | ||
73 | AC_REPLACE_FUNCS(tgamma) | ||
74 | |||
75 | +RUBY_REPLACE_FUNC([finite], [@%:@include <math.h>]) | ||
76 | +RUBY_REPLACE_FUNC([isinf], [@%:@include <math.h>]) | ||
77 | +RUBY_REPLACE_FUNC([isnan], [@%:@include <math.h>]) | ||
78 | + | ||
79 | # for missing/setproctitle.c | ||
80 | AS_CASE(["$target_os"], | ||
81 | [aix* | k*bsd*-gnu | kopensolaris*-gnu | linux* | darwin*], [AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)], | ||
82 | diff --git a/tool/m4/ruby_replace_funcs.m4 b/tool/m4/ruby_replace_funcs.m4 | ||
83 | new file mode 100644 | ||
84 | index 0000000000..d0612e29a0 | ||
85 | --- /dev/null | ||
86 | +++ b/tool/m4/ruby_replace_funcs.m4 | ||
87 | @@ -0,0 +1,13 @@ | ||
88 | +# -*- Autoconf -*- | ||
89 | +dnl RUBY_REPLACE_FUNC [func] [included] | ||
90 | +AC_DEFUN([RUBY_REPLACE_FUNC], [dnl | ||
91 | + AC_CHECK_DECL([$1],dnl | ||
92 | + [AC_DEFINE(AS_TR_CPP(HAVE_[$1]))],dnl | ||
93 | + [AC_REPLACE_FUNCS($1)],dnl | ||
94 | + [$2])dnl | ||
95 | +]) | ||
96 | + | ||
97 | +dnl RUBY_REPLACE_FUNCS [funcs] [included] | ||
98 | +AC_DEFUN([RUBY_REPLACE_FUNCS] [dnl | ||
99 | + m4_map_args_w([$1], [RUBY_REPLACE_FUNC(], [), [$2]])dnl | ||
100 | +]) | ||
101 | -- | ||
102 | 2.23.0.rc1 | ||
103 | |||
diff --git a/meta/recipes-devtools/ruby/ruby_2.6.5.bb b/meta/recipes-devtools/ruby/ruby_2.7.0.bb index 0cdf6ee09f..c796318717 100644 --- a/meta/recipes-devtools/ruby/ruby_2.6.5.bb +++ b/meta/recipes-devtools/ruby/ruby_2.7.0.bb | |||
@@ -1,13 +1,13 @@ | |||
1 | require ruby.inc | 1 | require ruby.inc |
2 | 2 | ||
3 | SRC_URI += " \ | 3 | SRC_URI += " \ |
4 | file://0003-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch \ | ||
5 | file://remove_has_include_macros.patch \ | 4 | file://remove_has_include_macros.patch \ |
6 | file://run-ptest \ | 5 | file://run-ptest \ |
6 | file://0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch \ | ||
7 | " | 7 | " |
8 | 8 | ||
9 | SRC_URI[md5sum] = "8754bfb36d52c2bf1fb3d3ddc7101606" | 9 | SRC_URI[md5sum] = "bf4a54e8231176e109a42c546b4725a9" |
10 | SRC_URI[sha256sum] = "66976b716ecc1fd34f9b7c3c2b07bbd37631815377a2e3e85a5b194cfdcbed7d" | 10 | SRC_URI[sha256sum] = "8c99aa93b5e2f1bc8437d1bbbefd27b13e7694025331f77245d0c068ef1f8cbe" |
11 | 11 | ||
12 | PACKAGECONFIG ??= "" | 12 | PACKAGECONFIG ??= "" |
13 | PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" | 13 | PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" |