[oe-commits] [meta-openembedded] 28/51: libhugetlbfs: add libhugetlbfs-perl to RDEPENDS
git at git.openembedded.org
git at git.openembedded.org
Mon Sep 5 11:34:08 UTC 2016
martin_jansa pushed a commit to branch master
in repository meta-openembedded.
commit bf918d5384a062f99ee5b775a319cde0b06e77bf
Author: Mingli Yu <Mingli.Yu at windriver.com>
AuthorDate: Thu Aug 25 09:41:32 2016 +0800
libhugetlbfs: add libhugetlbfs-perl to RDEPENDS
* Add libhugetlbfs-perl to RDEPENDS for libhugetlbfs
as some perl scripts in package libhugetlbfs depend
on the perl module provided by libhugetlbfs-perl
* Update the perl module install folder to
$(LIBDIR64)/perl/${@get_perl_version(d)}/TLBC such as
/usr/lib64/perl/5.22.1/TLBC/OpCollect.pm otherwise the
perl scripts can't find the perl module as below:
Can't locate TLBC/OpCollect.pm in @INC (you may need to install
the TLBC::OpCollect module) (@INC contains: /usr/bin
/etc/perl /usr/lib64/perl/site_perl/5.22.1/
/usr/lib64/perl/site_perl/5.22.1
/usr/lib64/perl/vendor_perl/5.22.1/
/usr/lib64/perl/vendor_perl/5.22.1 /usr/lib64/perl/5.22.1/
/usr/lib64/perl/5.22.1 /usr/local/lib/site_perl .)
at /usr/bin/cpupcstat line 12.
BEGIN failed--compilation aborted at /usr/bin/cpupcstat line 12.
Signed-off-by: Mingli Yu <Mingli.Yu at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
index accbffd..301b550 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
@@ -4,7 +4,7 @@ LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1"
DEPENDS = "sysfsutils perl"
-RDEPENDS_${PN} += "bash perl python python-io python-lang python-subprocess python-resource"
+RDEPENDS_${PN} += "bash perl python python-io python-lang python-subprocess python-resource ${PN}-perl"
RDEPENDS_${PN}-tests += "bash"
PV = "2.19"
@@ -37,6 +37,7 @@ CFLAGS += "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -g0
TARGET_CC_ARCH += "${LDFLAGS}"
#The CUSTOM_LDSCRIPTS doesn't work with the gold linker
+inherit cpan-base
do_configure() {
if [ "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then
sed -i 's/CUSTOM_LDSCRIPTS = yes/CUSTOM_LDSCRIPTS = no/' Makefile
@@ -44,6 +45,11 @@ do_configure() {
# fixup perl module directory hardcoded to perl5
sed -i 's/perl5/perl/g' Makefile
+
+ # fixup to install perl module under $(LIBDIR)/perl/${@get_perl_version(d)}/TLBC
+ # to avoid below error
+ # Can't locate TLBC/OpCollect.pm in @INC
+ sed -i '/^PMDIR/ s:perl:perl/${@get_perl_version(d)}:g' Makefile
}
do_install() {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list