From 80812641bf73d2a74a8e7fd29572d4cef6f0bd94 Mon Sep 17 00:00:00 2001 From: Stephen Arnold Date: Tue, 26 Jan 2016 17:29:21 -0800 Subject: net-snmp: fix cross-compile breakage, add libnl pkgconfig option This patch enhances a previously unapplied patch on jethro, plus adds some flexibility in terms of required deps and a few cleanups. Signed-off-by: Stephen Arnold Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb | 10 ++++++++-- 1 file changed, 8 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 83641964ba..e8df06c84a 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 @@ -28,7 +28,7 @@ SRC_URI[sha256sum] = "e8dfc79b6539b71a6ff335746ce63d2da2239062ad41872fff4354cafe inherit autotools update-rc.d siteinfo systemd pkgconfig -EXTRA_OEMAKE = "INSTALL_PREFIX=${D}" +EXTRA_OEMAKE = "INSTALL_PREFIX=${D} OTHERLDFLAGS='${LDFLAGS}' HOST_CPPFLAGS='${BUILD_CPPFLAGS}'" PARALLEL_MAKE = "" CCACHE = "" @@ -37,12 +37,13 @@ TARGET_CC_ARCH += "${LDFLAGS}" PACKAGECONFIG ??= "" PACKAGECONFIG[elfutils] = "--with-elf, --without-elf, elfutils" +PACKAGECONFIG[libnl] = "--with-nl, --without-nl, libnl" EXTRA_OECONF = "--disable-embedded-perl \ --with-perl-modules=no \ - --enable-shared \ --disable-manuals \ --with-defaults \ + --with-install-prefix=${D} \ --with-persistent-directory=${localstatedir}/lib/net-snmp \ ${@base_conditional('SITEINFO_ENDIANNESS', 'le', '--with-endianness=little', '--with-endianness=big', d)}" @@ -52,10 +53,15 @@ EXTRA_OECONF += "--with-mib-modules=smux" CACHED_CONFIGUREVARS = " \ ac_cv_header_valgrind_valgrind_h=no \ ac_cv_header_valgrind_memcheck_h=no \ + ac_cv_ETC_MNTTAB=/etc/mtab \ + lt_cv_shlibpath_overrides_runpath=yes \ " do_configure_prepend() { export PERLPROG="${bindir}/env perl" + sed -i -e "s|I/usr/include|I${STAGING_INCDIR}|g" \ + "${S}"/configure \ + "${S}"/configure.d/config_os_libs2 } do_install_append() { -- cgit 1.2.3-korg