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 --- meta/recipes-devtools/elfutils/elfutils_0.185.bb | 46 ++++++++++++------------ 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'meta/recipes-devtools/elfutils') diff --git a/meta/recipes-devtools/elfutils/elfutils_0.185.bb b/meta/recipes-devtools/elfutils/elfutils_0.185.bb index b1ffbc18bf..3e06e7b200 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.185.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.185.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://debuginfod/debuginfod-client.c;endline=27;md5=f8e9d171c401c493ec45a0b2992ea2ed \ " DEPENDS = "zlib virtual/libintl" -DEPENDS_append_libc-musl = " argp-standalone fts musl-obstack " +DEPENDS:append:libc-musl = " argp-standalone fts musl-obstack " # The Debian patches below are from: # http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.176-1.debian.tar.xz SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ @@ -23,7 +23,7 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ file://0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch \ file://0001-debuginfod-debuginfod-client.c-correct-string-format.patch \ " -SRC_URI_append_libc-musl = " \ +SRC_URI:append:libc-musl = " \ file://0002-musl-libs.patch \ file://0003-musl-utils.patch \ file://0004-Fix-error-on-musl.patch \ @@ -36,7 +36,7 @@ inherit autotools gettext ptest pkgconfig EXTRA_OECONF = "--program-prefix=eu-" DEPENDS_BZIP2 = "bzip2-replacement-native" -DEPENDS_BZIP2_class-target = "bzip2" +DEPENDS_BZIP2:class-target = "bzip2" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'debuginfod', 'debuginfod libdebuginfod', '', d)}" PACKAGECONFIG[bzip2] = "--with-bzlib,--without-bzlib,${DEPENDS_BZIP2}" @@ -44,11 +44,11 @@ PACKAGECONFIG[xz] = "--with-lzma,--without-lzma,xz" PACKAGECONFIG[libdebuginfod] = "--enable-libdebuginfod,--disable-libdebuginfod,curl" PACKAGECONFIG[debuginfod] = "--enable-debuginfod,--disable-debuginfod,libarchive sqlite3 libmicrohttpd" -RDEPENDS_${PN}-ptest += "libasm libelf bash make coreutils ${PN}-binutils iproute2-ss bsdtar" +RDEPENDS:${PN}-ptest += "libasm libelf bash make coreutils ${PN}-binutils iproute2-ss bsdtar" -EXTRA_OECONF_append_class-target = " --disable-tests-rpath" +EXTRA_OECONF:append:class-target = " --disable-tests-rpath" -RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils" +RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-utils" do_compile_ptest() { cd ${B}/tests @@ -92,8 +92,8 @@ do_install_ptest() { fi } -EXTRA_OEMAKE_class-native = "" -EXTRA_OEMAKE_class-nativesdk = "" +EXTRA_OEMAKE:class-native = "" +EXTRA_OEMAKE:class-nativesdk = "" BBCLASSEXTEND = "native nativesdk" @@ -105,14 +105,14 @@ PACKAGES =+ "${PN}-binutils libelf libasm libdw libdebuginfod" # "The license is now GPLv2/LGPLv3+ for the libraries and GPLv3+ for stand-alone # programs. There is now also a formal CONTRIBUTING document describing how to # submit patches." -LICENSE_${PN}-binutils = "GPLv3+" -LICENSE_${PN} = "GPLv3+" -LICENSE_libelf = "GPLv2 | LGPLv3+" -LICENSE_libasm = "GPLv2 | LGPLv3+" -LICENSE_libdw = "GPLv2 | LGPLv3+" -LICENSE_libdebuginfod = "GPLv2+ | LGPLv3+" - -FILES_${PN}-binutils = "\ +LICENSE:${PN}-binutils = "GPLv3+" +LICENSE:${PN} = "GPLv3+" +LICENSE:libelf = "GPLv2 | LGPLv3+" +LICENSE:libasm = "GPLv2 | LGPLv3+" +LICENSE:libdw = "GPLv2 | LGPLv3+" +LICENSE:libdebuginfod = "GPLv2+ | LGPLv3+" + +FILES:${PN}-binutils = "\ ${bindir}/eu-addr2line \ ${bindir}/eu-ld \ ${bindir}/eu-nm \ @@ -120,19 +120,19 @@ FILES_${PN}-binutils = "\ ${bindir}/eu-size \ ${bindir}/eu-strip" -FILES_libelf = "${libdir}/libelf-${PV}.so ${libdir}/libelf.so.*" -FILES_libasm = "${libdir}/libasm-${PV}.so ${libdir}/libasm.so.*" -FILES_libdw = "${libdir}/libdw-${PV}.so ${libdir}/libdw.so.* ${libdir}/elfutils/lib*" -FILES_libdebuginfod = "${libdir}/libdebuginfod-${PV}.so ${libdir}/libdebuginfod.so.*" +FILES:libelf = "${libdir}/libelf-${PV}.so ${libdir}/libelf.so.*" +FILES:libasm = "${libdir}/libasm-${PV}.so ${libdir}/libasm.so.*" +FILES:libdw = "${libdir}/libdw-${PV}.so ${libdir}/libdw.so.* ${libdir}/elfutils/lib*" +FILES:libdebuginfod = "${libdir}/libdebuginfod-${PV}.so ${libdir}/libdebuginfod.so.*" # Some packages have the version preceeding the .so instead properly # versioned .so., so we need to reorder and repackage. #FILES_${PN} += "${libdir}/*-${PV}.so ${base_libdir}/*-${PV}.so" #FILES_SOLIBSDEV = "${libdir}/libasm.so ${libdir}/libdw.so ${libdir}/libelf.so" # The package contains symlinks that trip up insane -INSANE_SKIP_${MLPREFIX}libdw = "dev-so" +INSANE_SKIP:${MLPREFIX}libdw = "dev-so" # The nlist binary in the tests uses explicitly minimal compiler flags -INSANE_SKIP_${PN}-ptest += "ldflags" +INSANE_SKIP:${PN}-ptest += "ldflags" # avoid stripping some generated binaries otherwise some of the tests such as test-nlist, # run-strip-reloc.sh, run-strip-strmerge.sh and so on will fail @@ -161,4 +161,4 @@ INHIBIT_PACKAGE_STRIP_FILES = "\ ${PKGD}${PTEST_PATH}/backends/libebl_x86_64.so \ " -PRIVATE_LIBS_${PN}-ptest = "libdw.so.1 libelf.so.1 libasm.so.1 libdebuginfod.so.1" +PRIVATE_LIBS:${PN}-ptest = "libdw.so.1 libelf.so.1 libasm.so.1 libdebuginfod.so.1" -- cgit 1.2.3-korg