[oe-commits] [openembedded-core] 29/46: rpm: move ASNEEDED over-ride into the rpm recipe

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit f3d223304e52b9be946e5bd849075147147cbbb3
Author: Andre McCurdy <armccurdy at gmail.com>
AuthorDate: Wed May 9 14:46:48 2018 -0700

    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 <armccurdy at gmail.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 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(-)

diff --git a/meta/conf/distro/include/as-needed.inc b/meta/conf/distro/include/as-needed.inc
index f56d432..9c23564 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 818d3ef..d49530e 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() {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.