From 42344347be29f0997cc2f7636d9603b1fe1875ae Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 28 Jul 2021 23:28:15 +0100 Subject: Convert to new override syntax This is the result of automated script conversion: scripts/contrib/convert-overrides.py converting the metadata to use ":" as the override character instead of "_". Signed-off-by: Richard Purdie --- .../binutils/binutils-cross-canadian.inc | 2 +- .../binutils/binutils-crosssdk_2.37.bb | 2 +- meta/recipes-devtools/binutils/binutils.inc | 26 +++++++++++----------- meta/recipes-devtools/binutils/binutils_2.37.bb | 24 ++++++++++---------- 4 files changed, 27 insertions(+), 27 deletions(-) (limited to 'meta/recipes-devtools/binutils') diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc index e98f31f9c3..f44f46602d 100644 --- a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc +++ b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc @@ -13,7 +13,7 @@ EXTRA_OECONF += "--with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VEND # e.g. we switch between different machines with different tunes. EXTRA_OECONF[vardepsexclude] = "TUNE_PKGARCH" -LDGOLD_sdkmingw32 = "" +LDGOLD:sdkmingw32 = "" do_install () { autotools_do_install diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.37.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.37.bb index 37f4d6d2e9..5bd036fd46 100644 --- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.37.bb +++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.37.bb @@ -8,6 +8,6 @@ PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk" SRC_URI += "file://0001-binutils-crosssdk-Generate-relocatable-SDKs.patch" -do_configure_prepend () { +do_configure:prepend () { sed -i 's#/usr/local/lib /lib /usr/lib#${SDKPATHNATIVE}/lib ${SDKPATHNATIVE}/usr/lib /usr/local/lib /lib /usr/lib#' ${S}/ld/configure.tgt } diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index e15a12b93e..7d5149fa16 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc @@ -15,7 +15,7 @@ DEPENDS = "flex-native bison-native zlib-native gnu-config-native autoconf-nativ inherit autotools gettext multilib_header texinfo -FILES_${PN} = " \ +FILES:${PN} = " \ ${bindir}/${TARGET_PREFIX}* \ ${libdir}/lib*.so.* \ ${libdir}/bfd-plugins/lib*.so \ @@ -23,9 +23,9 @@ FILES_${PN} = " \ ${prefix}/${TARGET_SYS}/bin/* \ ${bindir}/embedspu" -RPROVIDES_${PN} += "${PN}-symlinks" +RPROVIDES:${PN} += "${PN}-symlinks" -FILES_${PN}-dev = " \ +FILES:${PN}-dev = " \ ${includedir} \ ${libdir}/*.la \ ${libdir}/libbfd.so \ @@ -37,9 +37,9 @@ FILES_${PN}-dev = " \ # list and reuse it. LDGOLD_ALTS ?= "ld.gold dwp" -LDGOLD_ALTS_riscv64 = "" -LDGOLD_ALTS_riscv32 = "" -LDGOLD_ALTS_libc-glibc_mipsarch = "" +LDGOLD_ALTS:riscv64 = "" +LDGOLD_ALTS:riscv32 = "" +LDGOLD_ALTS:libc-glibc:mipsarch = "" USE_ALTERNATIVES_FOR = " \ addr2line \ @@ -61,7 +61,7 @@ USE_ALTERNATIVES_FOR = " \ strip \ " -python do_package_prepend() { +python do_package:prepend() { make_alts = d.getVar("USE_ALTERNATIVES_FOR") or "" prefix = d.getVar("TARGET_PREFIX") bindir = d.getVar("bindir") @@ -86,12 +86,12 @@ EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \ ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}" EXTRA_TARGETS = "" -EXTRA_TARGETS_x86-64 = " --enable-targets=x86_64-pe,x86_64-pep " -EXTRA_TARGETS_class-native = "" +EXTRA_TARGETS:x86-64 = " --enable-targets=x86_64-pe,x86_64-pep " +EXTRA_TARGETS:class-native = "" -LDGOLD_class-native = "" -LDGOLD_class-crosssdk = "" -LDGOLD_libc-glibc_mipsarch = "" +LDGOLD:class-native = "" +LDGOLD:class-crosssdk = "" +LDGOLD:libc-glibc:mipsarch = "" LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default --enable-threads', d)}" @@ -176,7 +176,7 @@ inherit update-alternatives ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN}_class-target = "${USE_ALTERNATIVES_FOR}" +ALTERNATIVE:${PN}:class-target = "${USE_ALTERNATIVES_FOR}" python () { if bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', True, False, d) and bb.utils.contains_any('TARGET_ARCH', 'riscv32 riscv64', True, False, d): diff --git a/meta/recipes-devtools/binutils/binutils_2.37.bb b/meta/recipes-devtools/binutils/binutils_2.37.bb index ee9617de1d..ff9377049b 100644 --- a/meta/recipes-devtools/binutils/binutils_2.37.bb +++ b/meta/recipes-devtools/binutils/binutils_2.37.bb @@ -10,11 +10,11 @@ EXTRA_OECONF += "--with-sysroot=/ \ --with-system-zlib \ " -EXTRA_OEMAKE_append_libc-musl = "\ +EXTRA_OEMAKE:append:libc-musl = "\ gt_cv_func_gnugettext1_libc=yes \ gt_cv_func_gnugettext2_libc=yes \ " -EXTRA_OECONF_class-native = "--enable-targets=all \ +EXTRA_OECONF:class-native = "--enable-targets=all \ --enable-64-bit-bfd \ --enable-install-libiberty \ --enable-install-libbfd \ @@ -29,10 +29,10 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'debuginfod', d)}" PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod, elfutils" # gcc9.0 end up mis-compiling libbfd.so with O2 which then crashes on target # So remove -O2 and use -Os as workaround -SELECTED_OPTIMIZATION_remove_mipsarch = "-O2" -SELECTED_OPTIMIZATION_append_mipsarch = " -Os" +SELECTED_OPTIMIZATION:remove:mipsarch = "-O2" +SELECTED_OPTIMIZATION:append:mipsarch = " -Os" -do_install_class-native () { +do_install:class-native () { autotools_do_install # Install the libiberty header @@ -55,19 +55,19 @@ do_install_class-native () { } # libctf races with libbfd -PARALLEL_MAKEINST_class-target = "" -PARALLEL_MAKEINST_class-nativesdk = "" +PARALLEL_MAKEINST:class-target = "" +PARALLEL_MAKEINST:class-nativesdk = "" # Split out libbfd-*.so and libopcodes-*.so so including perf doesn't include # extra stuff PACKAGE_BEFORE_PN += "libbfd libopcodes" -FILES_libbfd = "${libdir}/libbfd-*.so.* ${libdir}/libbfd-*.so" -FILES_libopcodes = "${libdir}/libopcodes-*.so.* ${libdir}/libopcodes-*.so" +FILES:libbfd = "${libdir}/libbfd-*.so.* ${libdir}/libbfd-*.so" +FILES:libopcodes = "${libdir}/libopcodes-*.so.* ${libdir}/libopcodes-*.so" -SRC_URI_append_class-nativesdk = " file://0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch " +SRC_URI:append:class-nativesdk = " file://0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch " -USE_ALTERNATIVES_FOR_class-nativesdk = "" -FILES_${PN}_append_class-nativesdk = " ${bindir}" +USE_ALTERNATIVES_FOR:class-nativesdk = "" +FILES:${PN}:append:class-nativesdk = " ${bindir}" BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg