From a375d82d5287417286d50ebbfb3d6d2b386731cd Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Fri, 27 Sep 2019 16:02:34 +0800 Subject: net-snmp: Fix PACKAGECONFIG for perl * Remove perl-lib since it had been removed by oe-core: commit 68552c353255188de3d5b42135360a30e7eac535 Author: Alexander Kanavin Date: Sun Dec 2 12:46:37 2018 +0100 perl: remove the previous version of the recipe Now the files are in perl pacakge. * Fix perl paths when perl is enabled. Signed-off-by: Robert Yang --- meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb index 60b2b389d1..192b6b506b 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb @@ -50,7 +50,7 @@ PACKAGECONFIG[libnl] = "--with-nl, --without-nl, libnl" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,," PACKAGECONFIG[perl] = "--enable-embedded-perl --with-perl-modules=yes, --disable-embedded-perl --with-perl-modules=no,\ - perl, perl perl-lib" + perl," PACKAGECONFIG[des] = "--enable-des,--disable-des" EXTRA_OECONF = "--enable-shared \ @@ -88,8 +88,8 @@ do_configure_prepend() { if [ "${HAS_PERL}" = "1" ]; then # this may need to be changed when package perl has any change. - cp -f ${STAGING_DIR_TARGET}/usr/lib*/perl/*/Config.pm ${WORKDIR}/ - cp -f ${STAGING_DIR_TARGET}/usr/lib*/perl/*/Config_heavy.pl ${WORKDIR}/ + cp -f ${STAGING_DIR_TARGET}/usr/lib*/perl?/*/Config.pm ${WORKDIR}/ + cp -f ${STAGING_DIR_TARGET}/usr/lib*/perl?/*/*/Config_heavy.pl ${WORKDIR}/ sed -e "s@libpth => '/usr/lib.*@libpth => '${STAGING_DIR_TARGET}/${libdir} ${STAGING_DIR_TARGET}/${base_libdir}',@g" \ -e "s@privlibexp => '/usr@privlibexp => '${STAGING_DIR_TARGET}/usr@g" \ -e "s@scriptdir => '/usr@scriptdir => '${STAGING_DIR_TARGET}/usr@g" \ @@ -190,7 +190,8 @@ ALLOW_EMPTY_${PN} = "1" ALLOW_EMPTY_${PN}-server = "1" ALLOW_EMPTY_${PN}-libs = "1" -FILES_${PN}-perl-modules = "${libdir}/perl/*" +FILES_${PN}-perl-modules = "${libdir}/perl?/*" +RDEPENDS_${PN}-perl-modules = "perl" FILES_${PN}-libs = "" FILES_${PN}-mibs = "${datadir}/snmp/mibs" -- cgit 1.2.3-korg