[oe-commits] [meta-openembedded] 24/36: net-snmp: fix the replacement in net-snmp-config

[git at git.openembedded.org]

martin_jansa pushed a commit to branch jethro-next
in repository meta-openembedded.

commit c94fdd75eeb5b6463b613d542205302fc44650ef
Author: Roy Li <rongqing.li at windriver.com>
AuthorDate: Thu Dec 31 17:01:09 2015 +0800

    net-snmp: fix the replacement in net-snmp-config
    
    when net-snmp-config is used to configure by other package, and fail since
    /libnl3 is not found, in fact, it should be -I/usr/include/libnl3, and is
    modified as /libnl3 incorrectly.
    
    instead of modify the net-snmp-config for target, the one under
    ${bindir_crossscripts} should be replaced with ${TAGING_INCDIR}
    
    Signed-off-by: Roy Li <rongqing.li at windriver.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
    Signed-off-by: Joe MacDonald <joe_macdonald at mentor.com>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 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 7b51cbb..06f3707 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
@@ -70,8 +70,7 @@ do_install_append() {
     install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/snmpd
     install -m 644 ${WORKDIR}/snmpd.conf ${D}${sysconfdir}/snmp/
     install -m 644 ${WORKDIR}/snmptrapd.conf ${D}${sysconfdir}/snmp/
-    sed -e "s at -I/usr/include@@g" \
-        -e "s@^prefix=.*@prefix=${STAGING_DIR_HOST}@g" \
+    sed    -e "s@^prefix=.*@prefix=${STAGING_DIR_HOST}@g" \
         -e "s@^exec_prefix=.*@exec_prefix=${STAGING_DIR_HOST}@g" \
         -e "s@^includedir=.*@includedir=${STAGING_INCDIR}@g" \
         -e "s@^libdir=.*@libdir=${STAGING_LIBDIR}@g" \
@@ -105,6 +104,8 @@ net_snmp_sysroot_preprocess () {
     if [ -e ${D}${bindir}/net-snmp-config ]; then
         install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
         install -m 755 ${D}${bindir}/net-snmp-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/
+        sed -e "s at -I/usr/include at -I${STAGING_INCDIR}@g" \
+          -i  ${SYSROOT_DESTDIR}${bindir_crossscripts}/net-snmp-config
     fi
 }
 

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