From 64f19d7873fe2410d188a96ecafde3222aae26a2 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Wed, 9 May 2018 14:46:48 -0700 Subject: rpm: move ASNEEDED over-ride into the rpm recipe Move the recipe specific over-ride for ASNEEDED into the recipe to make it more apparent that the over-ride is being applied (and that it should be re-checked on version updates, etc). (From OE-Core rev: f3d223304e52b9be946e5bd849075147147cbbb3) Signed-off-by: Andre McCurdy Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/conf/distro/include/as-needed.inc | 1 - meta/recipes-devtools/rpm/rpm_4.14.1.bb | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'meta') diff --git a/meta/conf/distro/include/as-needed.inc b/meta/conf/distro/include/as-needed.inc index f56d432bd5..9c235649b7 100644 --- a/meta/conf/distro/include/as-needed.inc +++ b/meta/conf/distro/include/as-needed.inc @@ -2,6 +2,5 @@ ASNEEDED = "-Wl,--as-needed" ASNEEDED_pn-openobex = "" -ASNEEDED_pn-rpm = "" TARGET_LDFLAGS += "${ASNEEDED}" diff --git a/meta/recipes-devtools/rpm/rpm_4.14.1.bb b/meta/recipes-devtools/rpm/rpm_4.14.1.bb index 818d3ef9e3..d49530e0b9 100644 --- a/meta/recipes-devtools/rpm/rpm_4.14.1.bb +++ b/meta/recipes-devtools/rpm/rpm_4.14.1.bb @@ -73,6 +73,8 @@ BBCLASSEXTEND = "native nativesdk" PACKAGECONFIG ??= "" PACKAGECONFIG[imaevm] = "--with-imaevm,,ima-evm-utils" +ASNEEDED = "" + # Direct rpm-native to read configuration from our sysroot, not the one it was compiled in # libmagic also has sysroot path contamination, so override it do_install_append_class-native() { -- cgit v1.2.3-54-g00ecf