From bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 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 "_". (From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae) Signed-off-by: Richard Purdie --- meta/recipes-support/libunwind/libunwind.inc | 10 +++++----- meta/recipes-support/libunwind/libunwind_1.5.0.bb | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'meta/recipes-support/libunwind') diff --git a/meta/recipes-support/libunwind/libunwind.inc b/meta/recipes-support/libunwind/libunwind.inc index 17ba151933..bf74f9fa3c 100644 --- a/meta/recipes-support/libunwind/libunwind.inc +++ b/meta/recipes-support/libunwind/libunwind.inc @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.nongnu.org/libunwind" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=2d80c8ed4062b8339b715f90fa68cc9f" DEPENDS += "libatomic-ops" -DEPENDS_append_libc-musl = " libucontext" +DEPENDS:append:libc-musl = " libucontext" inherit autotools multilib_header @@ -12,11 +12,11 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[lzma] = "--enable-minidebuginfo,--disable-minidebuginfo,xz" PACKAGECONFIG[latexdocs] = "--enable-documentation, --disable-documentation, latex2man-native" -EXTRA_OECONF_arm = "--enable-debug-frame" -EXTRA_OECONF_armeb = "--enable-debug-frame" -EXTRA_OECONF_aarch64 = "--enable-debug-frame" +EXTRA_OECONF:arm = "--enable-debug-frame" +EXTRA_OECONF:armeb = "--enable-debug-frame" +EXTRA_OECONF:aarch64 = "--enable-debug-frame" -do_install_append () { +do_install:append () { oe_multilib_header libunwind.h } diff --git a/meta/recipes-support/libunwind/libunwind_1.5.0.bb b/meta/recipes-support/libunwind/libunwind_1.5.0.bb index 6392cac5c9..9b515b58f4 100644 --- a/meta/recipes-support/libunwind/libunwind_1.5.0.bb +++ b/meta/recipes-support/libunwind/libunwind_1.5.0.bb @@ -8,21 +8,21 @@ SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV file://0006-Fix-for-X32.patch \ file://0001-configure-Do-not-enforce-libdir-for-ppc64.patch \ " -SRC_URI_append_libc-musl = " file://musl-header-conflict.patch" +SRC_URI:append:libc-musl = " file://musl-header-conflict.patch" SRC_URI[md5sum] = "c6923dda0675f6a4ef21426164dc8b6a" SRC_URI[sha256sum] = "90337653d92d4a13de590781371c604f9031cdb50520366aa1e3a91e1efb1017" -EXTRA_OECONF_append_libc-musl = " --disable-documentation --disable-tests --enable-static" +EXTRA_OECONF:append:libc-musl = " --disable-documentation --disable-tests --enable-static" # http://errors.yoctoproject.org/Errors/Details/20487/ -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" -COMPATIBLE_HOST_riscv64 = "null" -COMPATIBLE_HOST_riscv32 = "null" +COMPATIBLE_HOST:riscv64 = "null" +COMPATIBLE_HOST:riscv32 = "null" LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SECURITY_LDFLAGS_append_libc-musl = " -lssp_nonshared" -CACHED_CONFIGUREVARS_append_libc-musl = " LDFLAGS='${LDFLAGS} -lucontext'" +SECURITY_LDFLAGS:append:libc-musl = " -lssp_nonshared" +CACHED_CONFIGUREVARS:append:libc-musl = " LDFLAGS='${LDFLAGS} -lucontext'" -- cgit v1.2.3-54-g00ecf