[oe-commits] [meta-openembedded] 07/21: net-snmp: Fix compiler options with paths in net-snmp-config

[git at git.openembedded.org]

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

armin_kuster pushed a commit to branch master-next
in repository meta-openembedded.

commit f3d01877dc173017f0609e686dd9eaadfacb1422
Author: Khem Raj <raj.khem at gmail.com>
AuthorDate: Wed Jan 31 17:44:13 2018 -0800

    net-snmp: Fix compiler options with paths in net-snmp-config
    
    options which involve paths into workspace are usually filtered out
    with the sed command, however currently it does half the job and the
    resulting config file gets partial replacements leaving the compiler
    options with bad syntax e.g.
    
    -fdebug-prefix-map option is left with -fdebug-prefix-map=
    which is not correct syntax, the effect of this is seen in other
    recipes which then invoke net-snmp-config script and add the
    flags obtained from this script into its own configure scripts
    and then tries to execute tests, these tests fail because of
    bad compiler options e.g. keepalived where configure tests fails like
    
    | configure: error: *** incorrect CFLAGS from net-snmp-config
    
    this is because of wrong compiler options that it got from
    recipe-sysroot/usr/bin/crossscripts/net-snmp-config
    
    This patch tries to be specific about which options should
    be skimmed and removes the options completely
    
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
index 5a7773e..faf73a5 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
@@ -119,10 +119,10 @@ do_install_append() {
     sed    -e "s@^NSC_SRCDIR=.*@NSC_SRCDIR=. at g" \
         -i ${D}${bindir}/net-snmp-create-v3-user
     sed    -e "s@^NSC_SRCDIR=.*@NSC_SRCDIR=. at g" \
-           -e "s@${STAGING_DIR_NATIVE}[=]*@@g" \
-           -e "s@${STAGING_DIR_HOST}[=]*@@g" \
-           -e "s@${WORKDIR}[=]*@@g" \
-           -e "s@${D}@@g" \
+           -e "s@\([^ ]*-fdebug-prefix-map=[^ ]*\)\1*@@g" \
+           -e "s@\([^ ]*--sysroot=[^ ]*\)\1*@@g" \
+           -e "s@\([^ ]*--with-libtool-sysroot=[^ ]*\)\1*@@g" \
+           -e "s@\([^ ]*--with-install-prefix=[^ ]*\)\1*@@g" \
         -i ${D}${bindir}/net-snmp-config
 
     if [ "${HAS_PERL}" = "1" ]; then

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