diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-28 22:32:26 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-29 21:21:53 +0000 |
commit | 4ef8f9920ac41ba8823ebe9a9e23e23be3f49f0a (patch) | |
tree | 15289d44bbd142accd81cedb4e2b6b948eee60fb /meta/recipes-devtools | |
parent | 1cd82ae6557bd20b33d0827cbc0a3f386f4da5b1 (diff) | |
download | poky-4ef8f9920ac41ba8823ebe9a9e23e23be3f49f0a.tar.gz |
ruby: Fix to work with autoconf 2.70
Drop a macro we don't need which was breaking with autoconf 2.70.
(From OE-Core rev: 995a0421ab39d62354e56f77eca10e2d176582d4)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/ruby/ruby/autoconf270.patch | 34 | ||||
-rw-r--r-- | meta/recipes-devtools/ruby/ruby_2.7.2.bb | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-devtools/ruby/ruby/autoconf270.patch b/meta/recipes-devtools/ruby/ruby/autoconf270.patch new file mode 100644 index 0000000000..8d205bde43 --- /dev/null +++ b/meta/recipes-devtools/ruby/ruby/autoconf270.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | This macro breaks under autoconf 2.70. Since we don't worry abot darwin or | ||
2 | openbsd builds, simply remove it. | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | RP - 2021/1/28 | ||
6 | |||
7 | Index: ruby-2.7.2/configure.ac | ||
8 | =================================================================== | ||
9 | --- ruby-2.7.2.orig/configure.ac | ||
10 | +++ ruby-2.7.2/configure.ac | ||
11 | @@ -170,23 +170,6 @@ dnl orig_cxxflags="$cxxflags" | ||
12 | dnl cxxflags="$cxxflags "'${optflags} ${debugflags} ${warnflags}' | ||
13 | dnl ]) | ||
14 | |||
15 | -AS_CASE(["$host_os:$build_os"], | ||
16 | -[darwin*:darwin*], [ | ||
17 | - AC_CHECK_TOOLS(CC, [clang gcc cc]) | ||
18 | - # Following Apple deployed clang are broken | ||
19 | - # clang version 1.0 (http://llvm.org/svn/llvm-project/cfe/tags/Apple/clang-23 exported) | ||
20 | - # Apple clang version 2.0 (tags/Apple/clang-137) (based on LLVM 2.9svn) | ||
21 | - # Apple clang version 2.1 (tags/Apple/clang-163.7.1) (based on LLVM 3.0svn) | ||
22 | - AS_IF([! $CC -E -xc - <<SRC >/dev/null], [ | ||
23 | - @%:@if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3 | ||
24 | - @%:@error premature clang | ||
25 | - @%:@endif | ||
26 | -SRC | ||
27 | - AC_MSG_ERROR([clang version 3.0 or later is required]) | ||
28 | - ])], | ||
29 | -[openbsd*:openbsd*], [ | ||
30 | - AC_CHECK_TOOLS(CC, [cc]) | ||
31 | -]) | ||
32 | AS_IF([test x"${build}" != x"${host}"], [ | ||
33 | AC_CHECK_TOOL(CC, gcc) | ||
34 | ]) | ||
diff --git a/meta/recipes-devtools/ruby/ruby_2.7.2.bb b/meta/recipes-devtools/ruby/ruby_2.7.2.bb index db6d672985..8c338ebecf 100644 --- a/meta/recipes-devtools/ruby/ruby_2.7.2.bb +++ b/meta/recipes-devtools/ruby/ruby_2.7.2.bb | |||
@@ -7,6 +7,7 @@ SRC_URI += " \ | |||
7 | file://run-ptest \ | 7 | file://run-ptest \ |
8 | file://0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch \ | 8 | file://0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch \ |
9 | file://0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch \ | 9 | file://0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch \ |
10 | file://autoconf270.patch \ | ||
10 | " | 11 | " |
11 | 12 | ||
12 | SRC_URI[md5sum] = "2d4a28dcfa38352a627a597f6057c465" | 13 | SRC_URI[md5sum] = "2d4a28dcfa38352a627a597f6057c465" |