diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2019-09-29 11:24:43 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-09-30 16:54:51 -0700 |
commit | 80aca3996342734e68a2d49ee0e29408c89cdadd (patch) | |
tree | c569cdffe881a86d7bbe284988c9b9bfcdc37d08 /meta-networking | |
parent | 855a7dade8603f4dc7302e3a7a7894b3c76382cc (diff) | |
download | meta-openembedded-80aca3996342734e68a2d49ee0e29408c89cdadd.tar.gz |
net-snmp: Fix PACKAGECONFIG for perl
* Remove perl-lib since it had been removed by oe-core:
commit 68552c353255188de3d5b42135360a30e7eac535
Author: Alexander Kanavin <alex.kanavin@gmail.com>
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 <liezhi.yang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking')
-rw-r--r-- | meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb | 9 |
1 files 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 60b2b389d..192b6b506 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" | |||
50 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,," | 50 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,," |
51 | 51 | ||
52 | PACKAGECONFIG[perl] = "--enable-embedded-perl --with-perl-modules=yes, --disable-embedded-perl --with-perl-modules=no,\ | 52 | PACKAGECONFIG[perl] = "--enable-embedded-perl --with-perl-modules=yes, --disable-embedded-perl --with-perl-modules=no,\ |
53 | perl, perl perl-lib" | 53 | perl," |
54 | PACKAGECONFIG[des] = "--enable-des,--disable-des" | 54 | PACKAGECONFIG[des] = "--enable-des,--disable-des" |
55 | 55 | ||
56 | EXTRA_OECONF = "--enable-shared \ | 56 | EXTRA_OECONF = "--enable-shared \ |
@@ -88,8 +88,8 @@ do_configure_prepend() { | |||
88 | 88 | ||
89 | if [ "${HAS_PERL}" = "1" ]; then | 89 | if [ "${HAS_PERL}" = "1" ]; then |
90 | # this may need to be changed when package perl has any change. | 90 | # this may need to be changed when package perl has any change. |
91 | cp -f ${STAGING_DIR_TARGET}/usr/lib*/perl/*/Config.pm ${WORKDIR}/ | 91 | cp -f ${STAGING_DIR_TARGET}/usr/lib*/perl?/*/Config.pm ${WORKDIR}/ |
92 | cp -f ${STAGING_DIR_TARGET}/usr/lib*/perl/*/Config_heavy.pl ${WORKDIR}/ | 92 | cp -f ${STAGING_DIR_TARGET}/usr/lib*/perl?/*/*/Config_heavy.pl ${WORKDIR}/ |
93 | sed -e "s@libpth => '/usr/lib.*@libpth => '${STAGING_DIR_TARGET}/${libdir} ${STAGING_DIR_TARGET}/${base_libdir}',@g" \ | 93 | sed -e "s@libpth => '/usr/lib.*@libpth => '${STAGING_DIR_TARGET}/${libdir} ${STAGING_DIR_TARGET}/${base_libdir}',@g" \ |
94 | -e "s@privlibexp => '/usr@privlibexp => '${STAGING_DIR_TARGET}/usr@g" \ | 94 | -e "s@privlibexp => '/usr@privlibexp => '${STAGING_DIR_TARGET}/usr@g" \ |
95 | -e "s@scriptdir => '/usr@scriptdir => '${STAGING_DIR_TARGET}/usr@g" \ | 95 | -e "s@scriptdir => '/usr@scriptdir => '${STAGING_DIR_TARGET}/usr@g" \ |
@@ -190,7 +190,8 @@ ALLOW_EMPTY_${PN} = "1" | |||
190 | ALLOW_EMPTY_${PN}-server = "1" | 190 | ALLOW_EMPTY_${PN}-server = "1" |
191 | ALLOW_EMPTY_${PN}-libs = "1" | 191 | ALLOW_EMPTY_${PN}-libs = "1" |
192 | 192 | ||
193 | FILES_${PN}-perl-modules = "${libdir}/perl/*" | 193 | FILES_${PN}-perl-modules = "${libdir}/perl?/*" |
194 | RDEPENDS_${PN}-perl-modules = "perl" | ||
194 | 195 | ||
195 | FILES_${PN}-libs = "" | 196 | FILES_${PN}-libs = "" |
196 | FILES_${PN}-mibs = "${datadir}/snmp/mibs" | 197 | FILES_${PN}-mibs = "${datadir}/snmp/mibs" |