diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-devtools/ruby | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/ruby')
-rw-r--r-- | meta/recipes-devtools/ruby/ruby.inc | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/ruby/ruby_3.0.2.bb | 26 |
2 files changed, 15 insertions, 15 deletions
diff --git a/meta/recipes-devtools/ruby/ruby.inc b/meta/recipes-devtools/ruby/ruby.inc index 1cede8d47c..c953a27042 100644 --- a/meta/recipes-devtools/ruby/ruby.inc +++ b/meta/recipes-devtools/ruby/ruby.inc | |||
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5b8c87559868796979806100db3f3805 \ | |||
14 | " | 14 | " |
15 | 15 | ||
16 | DEPENDS = "ruby-native zlib openssl libyaml gdbm readline libffi" | 16 | DEPENDS = "ruby-native zlib openssl libyaml gdbm readline libffi" |
17 | DEPENDS_class-native = "openssl-native libyaml-native readline-native zlib-native" | 17 | DEPENDS:class-native = "openssl-native libyaml-native readline-native zlib-native" |
18 | 18 | ||
19 | SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" | 19 | SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" |
20 | SRC_URI = "http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \ | 20 | SRC_URI = "http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \ |
@@ -33,7 +33,7 @@ inherit autotools ptest | |||
33 | # that the libraries aren't available and hence that the extension can't be | 33 | # that the libraries aren't available and hence that the extension can't be |
34 | # built. | 34 | # built. |
35 | 35 | ||
36 | do_configure_prepend() { | 36 | do_configure:prepend() { |
37 | sed -i "s#%%TARGET_CFLAGS%%#$CFLAGS#; s#%%TARGET_LDFLAGS%%#$LDFLAGS#" ${S}/common.mk | 37 | sed -i "s#%%TARGET_CFLAGS%%#$CFLAGS#; s#%%TARGET_LDFLAGS%%#$LDFLAGS#" ${S}/common.mk |
38 | rm -rf ${S}/ruby/ | 38 | rm -rf ${S}/ruby/ |
39 | } | 39 | } |
diff --git a/meta/recipes-devtools/ruby/ruby_3.0.2.bb b/meta/recipes-devtools/ruby/ruby_3.0.2.bb index f88e874c7b..a082735574 100644 --- a/meta/recipes-devtools/ruby/ruby_3.0.2.bb +++ b/meta/recipes-devtools/ruby/ruby_3.0.2.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require ruby.inc | 1 | require ruby.inc |
2 | 2 | ||
3 | DEPENDS_append_libc-musl = " libucontext" | 3 | DEPENDS:append:libc-musl = " libucontext" |
4 | 4 | ||
5 | SRC_URI += " \ | 5 | SRC_URI += " \ |
6 | file://remove_has_include_macros.patch \ | 6 | file://remove_has_include_macros.patch \ |
@@ -26,16 +26,16 @@ EXTRA_OECONF = "\ | |||
26 | --with-pkg-config=pkg-config \ | 26 | --with-pkg-config=pkg-config \ |
27 | " | 27 | " |
28 | 28 | ||
29 | EXTRA_OECONF_append_libc-musl = "\ | 29 | EXTRA_OECONF:append:libc-musl = "\ |
30 | LIBS='-lucontext' \ | 30 | LIBS='-lucontext' \ |
31 | ac_cv_func_isnan=yes \ | 31 | ac_cv_func_isnan=yes \ |
32 | ac_cv_func_isinf=yes \ | 32 | ac_cv_func_isinf=yes \ |
33 | " | 33 | " |
34 | 34 | ||
35 | EXTRA_OECONF_append_libc-musl_riscv64 = "\ | 35 | EXTRA_OECONF:append:libc-musl:riscv64 = "\ |
36 | --with-coroutine=copy \ | 36 | --with-coroutine=copy \ |
37 | " | 37 | " |
38 | EXTRA_OECONF_append_libc-musl_riscv32 = "\ | 38 | EXTRA_OECONF:append:libc-musl:riscv32 = "\ |
39 | --with-coroutine=copy \ | 39 | --with-coroutine=copy \ |
40 | " | 40 | " |
41 | 41 | ||
@@ -43,7 +43,7 @@ do_install() { | |||
43 | oe_runmake 'DESTDIR=${D}' install | 43 | oe_runmake 'DESTDIR=${D}' install |
44 | } | 44 | } |
45 | 45 | ||
46 | do_install_append_class-target () { | 46 | do_install:append:class-target () { |
47 | # Find out rbconfig.rb from .installed.list | 47 | # Find out rbconfig.rb from .installed.list |
48 | rbconfig_rb=`grep rbconfig.rb ${B}/.installed.list` | 48 | rbconfig_rb=`grep rbconfig.rb ${B}/.installed.list` |
49 | # Remove build host directories | 49 | # Remove build host directories |
@@ -80,17 +80,17 @@ do_install_ptest () { | |||
80 | 80 | ||
81 | PACKAGES =+ "${PN}-ri-docs ${PN}-rdoc" | 81 | PACKAGES =+ "${PN}-ri-docs ${PN}-rdoc" |
82 | 82 | ||
83 | SUMMARY_${PN}-ri-docs = "ri (Ruby Interactive) documentation for the Ruby standard library" | 83 | SUMMARY:${PN}-ri-docs = "ri (Ruby Interactive) documentation for the Ruby standard library" |
84 | RDEPENDS_${PN}-ri-docs = "${PN}" | 84 | RDEPENDS:${PN}-ri-docs = "${PN}" |
85 | FILES_${PN}-ri-docs += "${datadir}/ri" | 85 | FILES:${PN}-ri-docs += "${datadir}/ri" |
86 | 86 | ||
87 | SUMMARY_${PN}-rdoc = "RDoc documentation generator from Ruby source" | 87 | SUMMARY:${PN}-rdoc = "RDoc documentation generator from Ruby source" |
88 | RDEPENDS_${PN}-rdoc = "${PN}" | 88 | RDEPENDS:${PN}-rdoc = "${PN}" |
89 | FILES_${PN}-rdoc += "${libdir}/ruby/*/rdoc ${bindir}/rdoc" | 89 | FILES:${PN}-rdoc += "${libdir}/ruby/*/rdoc ${bindir}/rdoc" |
90 | 90 | ||
91 | FILES_${PN} += "${datadir}/rubygems" | 91 | FILES:${PN} += "${datadir}/rubygems" |
92 | 92 | ||
93 | FILES_${PN}-ptest_append_class-target = "\ | 93 | FILES:${PN}-ptest:append:class-target = "\ |
94 | ${libdir}/ruby/include \ | 94 | ${libdir}/ruby/include \ |
95 | ${libdir}/ruby/${SHRT_VER}.0/*/-test- \ | 95 | ${libdir}/ruby/${SHRT_VER}.0/*/-test- \ |
96 | " | 96 | " |