From: Andre McCurdy Date: Wed, 9 May 2018 21:46:48 +0000 (-0700) Subject: rpm: move ASNEEDED over-ride into the rpm recipe X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~17898 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3d223304e52b9be946e5bd849075147147cbbb3;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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). Signed-off-by: Andre McCurdy Signed-off-by: Ross Burton --- diff --git a/meta/conf/distro/include/as-needed.inc b/meta/conf/distro/include/as-needed.inc index f56d432bd57..9c235649b7b 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 818d3ef9e31..d49530e0b9b 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() {