From d751b85efe65a4b504c41dae7e8689680843d677 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 31 Jan 2018 17:44:13 -0800 Subject: 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 Signed-off-by: Armin Kuster Signed-off-by: Joe MacDonald --- meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'meta-networking') 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 5a7773e084..faf73a5636 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=.@g" \ -i ${D}${bindir}/net-snmp-create-v3-user sed -e "s@^NSC_SRCDIR=.*@NSC_SRCDIR=.@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 -- cgit 1.2.3-korg