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-support/libunwind | |
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-support/libunwind')
-rw-r--r-- | meta/recipes-support/libunwind/libunwind.inc | 10 | ||||
-rw-r--r-- | meta/recipes-support/libunwind/libunwind_1.5.0.bb | 16 |
2 files changed, 13 insertions, 13 deletions
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" | |||
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=2d80c8ed4062b8339b715f90fa68cc9f" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=2d80c8ed4062b8339b715f90fa68cc9f" |
6 | DEPENDS += "libatomic-ops" | 6 | DEPENDS += "libatomic-ops" |
7 | DEPENDS_append_libc-musl = " libucontext" | 7 | DEPENDS:append:libc-musl = " libucontext" |
8 | 8 | ||
9 | inherit autotools multilib_header | 9 | inherit autotools multilib_header |
10 | 10 | ||
@@ -12,11 +12,11 @@ PACKAGECONFIG ??= "" | |||
12 | PACKAGECONFIG[lzma] = "--enable-minidebuginfo,--disable-minidebuginfo,xz" | 12 | PACKAGECONFIG[lzma] = "--enable-minidebuginfo,--disable-minidebuginfo,xz" |
13 | PACKAGECONFIG[latexdocs] = "--enable-documentation, --disable-documentation, latex2man-native" | 13 | PACKAGECONFIG[latexdocs] = "--enable-documentation, --disable-documentation, latex2man-native" |
14 | 14 | ||
15 | EXTRA_OECONF_arm = "--enable-debug-frame" | 15 | EXTRA_OECONF:arm = "--enable-debug-frame" |
16 | EXTRA_OECONF_armeb = "--enable-debug-frame" | 16 | EXTRA_OECONF:armeb = "--enable-debug-frame" |
17 | EXTRA_OECONF_aarch64 = "--enable-debug-frame" | 17 | EXTRA_OECONF:aarch64 = "--enable-debug-frame" |
18 | 18 | ||
19 | do_install_append () { | 19 | do_install:append () { |
20 | oe_multilib_header libunwind.h | 20 | oe_multilib_header libunwind.h |
21 | } | 21 | } |
22 | 22 | ||
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 | |||
8 | file://0006-Fix-for-X32.patch \ | 8 | file://0006-Fix-for-X32.patch \ |
9 | file://0001-configure-Do-not-enforce-libdir-for-ppc64.patch \ | 9 | file://0001-configure-Do-not-enforce-libdir-for-ppc64.patch \ |
10 | " | 10 | " |
11 | SRC_URI_append_libc-musl = " file://musl-header-conflict.patch" | 11 | SRC_URI:append:libc-musl = " file://musl-header-conflict.patch" |
12 | 12 | ||
13 | SRC_URI[md5sum] = "c6923dda0675f6a4ef21426164dc8b6a" | 13 | SRC_URI[md5sum] = "c6923dda0675f6a4ef21426164dc8b6a" |
14 | SRC_URI[sha256sum] = "90337653d92d4a13de590781371c604f9031cdb50520366aa1e3a91e1efb1017" | 14 | SRC_URI[sha256sum] = "90337653d92d4a13de590781371c604f9031cdb50520366aa1e3a91e1efb1017" |
15 | 15 | ||
16 | EXTRA_OECONF_append_libc-musl = " --disable-documentation --disable-tests --enable-static" | 16 | EXTRA_OECONF:append:libc-musl = " --disable-documentation --disable-tests --enable-static" |
17 | 17 | ||
18 | # http://errors.yoctoproject.org/Errors/Details/20487/ | 18 | # http://errors.yoctoproject.org/Errors/Details/20487/ |
19 | ARM_INSTRUCTION_SET_armv4 = "arm" | 19 | ARM_INSTRUCTION_SET:armv4 = "arm" |
20 | ARM_INSTRUCTION_SET_armv5 = "arm" | 20 | ARM_INSTRUCTION_SET:armv5 = "arm" |
21 | 21 | ||
22 | COMPATIBLE_HOST_riscv64 = "null" | 22 | COMPATIBLE_HOST:riscv64 = "null" |
23 | COMPATIBLE_HOST_riscv32 = "null" | 23 | COMPATIBLE_HOST:riscv32 = "null" |
24 | 24 | ||
25 | LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 25 | LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
26 | 26 | ||
27 | SECURITY_LDFLAGS_append_libc-musl = " -lssp_nonshared" | 27 | SECURITY_LDFLAGS:append:libc-musl = " -lssp_nonshared" |
28 | CACHED_CONFIGUREVARS_append_libc-musl = " LDFLAGS='${LDFLAGS} -lucontext'" | 28 | CACHED_CONFIGUREVARS:append:libc-musl = " LDFLAGS='${LDFLAGS} -lucontext'" |