From eee8bb497f7f05b70db321e9bc0d702c7294b862 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Fri, 9 Jun 2023 23:57:26 +0000 Subject: binutils: move packaging of gprofng static lib into common .inc Commit f72fd51e0d (binutils: package static libs from gprofng) added corresponding FILES:${PN}-staticdev entry to the main .bb recipe. But binutils-cross-canadian fails with exactly the same QA issue, hence move FILES:${PN}-staticdev to the common shared .inc file. (From OE-Core rev: 75beddd33e132333c36ad067e2cf90edffeb5bf5) Signed-off-by: Denys Dmytriyenko Signed-off-by: Denys Dmytriyenko Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-devtools/binutils/binutils.inc | 2 ++ meta/recipes-devtools/binutils/binutils_2.40.bb | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index c69d29448f..e176b5cff1 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc @@ -33,6 +33,8 @@ FILES:${PN}-dev = " \ ${libdir}/libctf-nobfd.so \ ${libdir}/libopcodes.so" +FILES:${PN}-staticdev += "${libdir}/gprofng/*.a" + # Rather than duplicating multiple entries for these, make one # list and reuse it. diff --git a/meta/recipes-devtools/binutils/binutils_2.40.bb b/meta/recipes-devtools/binutils/binutils_2.40.bb index 9fe4bf5ae3..4ce1b4bec2 100644 --- a/meta/recipes-devtools/binutils/binutils_2.40.bb +++ b/meta/recipes-devtools/binutils/binutils_2.40.bb @@ -67,7 +67,6 @@ FILES:libbfd = "${libdir}/libbfd-*.so.* ${libdir}/libbfd-*.so" FILES:libopcodes = "${libdir}/libopcodes-*.so.* ${libdir}/libopcodes-*.so" FILES:gprofng = "${sysconfdir}/gprofng.rc ${libdir}/gprofng/libgp-*.so ${libdir}/gprofng/libgprofng.so.* ${bindir}/gp-* ${bindir}/gprofng" FILES:${PN}-dev += "${libdir}/libgprofng.so ${libdir}/libsframe.so" -FILES:${PN}-staticdev += "${libdir}/gprofng/*.a" SRC_URI:append:class-nativesdk = " file://0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch " USE_ALTERNATIVES_FOR:class-nativesdk = "" -- cgit v1.2.3-54-g00ecf