diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-30 14:25:58 +0100 |
commit | 42344347be29f0997cc2f7636d9603b1fe1875ae (patch) | |
tree | 9a061dbb101c5baf3f4e8c8be1322a1794584f3c /meta/recipes-devtools/ruby | |
parent | 72c04cb3ca78208a135275d6dd43ad500b663cb5 (diff) | |
download | openembedded-core-contrib-42344347be29f0997cc2f7636d9603b1fe1875ae.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 "_".
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 \ " DEPENDS = "ruby-native zlib openssl libyaml gdbm readline libffi" -DEPENDS_class-native = "openssl-native libyaml-native readline-native zlib-native" +DEPENDS:class-native = "openssl-native libyaml-native readline-native zlib-native" SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \ @@ -33,7 +33,7 @@ inherit autotools ptest # that the libraries aren't available and hence that the extension can't be # built. -do_configure_prepend() { +do_configure:prepend() { sed -i "s#%%TARGET_CFLAGS%%#$CFLAGS#; s#%%TARGET_LDFLAGS%%#$LDFLAGS#" ${S}/common.mk rm -rf ${S}/ruby/ } 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 @@ require ruby.inc -DEPENDS_append_libc-musl = " libucontext" +DEPENDS:append:libc-musl = " libucontext" SRC_URI += " \ file://remove_has_include_macros.patch \ @@ -26,16 +26,16 @@ EXTRA_OECONF = "\ --with-pkg-config=pkg-config \ " -EXTRA_OECONF_append_libc-musl = "\ +EXTRA_OECONF:append:libc-musl = "\ LIBS='-lucontext' \ ac_cv_func_isnan=yes \ ac_cv_func_isinf=yes \ " -EXTRA_OECONF_append_libc-musl_riscv64 = "\ +EXTRA_OECONF:append:libc-musl:riscv64 = "\ --with-coroutine=copy \ " -EXTRA_OECONF_append_libc-musl_riscv32 = "\ +EXTRA_OECONF:append:libc-musl:riscv32 = "\ --with-coroutine=copy \ " @@ -43,7 +43,7 @@ do_install() { oe_runmake 'DESTDIR=${D}' install } -do_install_append_class-target () { +do_install:append:class-target () { # Find out rbconfig.rb from .installed.list rbconfig_rb=`grep rbconfig.rb ${B}/.installed.list` # Remove build host directories @@ -80,17 +80,17 @@ do_install_ptest () { PACKAGES =+ "${PN}-ri-docs ${PN}-rdoc" -SUMMARY_${PN}-ri-docs = "ri (Ruby Interactive) documentation for the Ruby standard library" -RDEPENDS_${PN}-ri-docs = "${PN}" -FILES_${PN}-ri-docs += "${datadir}/ri" +SUMMARY:${PN}-ri-docs = "ri (Ruby Interactive) documentation for the Ruby standard library" +RDEPENDS:${PN}-ri-docs = "${PN}" +FILES:${PN}-ri-docs += "${datadir}/ri" -SUMMARY_${PN}-rdoc = "RDoc documentation generator from Ruby source" -RDEPENDS_${PN}-rdoc = "${PN}" -FILES_${PN}-rdoc += "${libdir}/ruby/*/rdoc ${bindir}/rdoc" +SUMMARY:${PN}-rdoc = "RDoc documentation generator from Ruby source" +RDEPENDS:${PN}-rdoc = "${PN}" +FILES:${PN}-rdoc += "${libdir}/ruby/*/rdoc ${bindir}/rdoc" -FILES_${PN} += "${datadir}/rubygems" +FILES:${PN} += "${datadir}/rubygems" -FILES_${PN}-ptest_append_class-target = "\ +FILES:${PN}-ptest:append:class-target = "\ ${libdir}/ruby/include \ ${libdir}/ruby/${SHRT_VER}.0/*/-test- \ " |