From 96757c3b6d37afc8723b1766d2e92ee0747a6243 Mon Sep 17 00:00:00 2001 From: "Qi.Chen@windriver.com" Date: Mon, 9 Nov 2015 09:34:20 +0800 Subject: rrdtool: install python site packages into libdir Fix the do_configure function to suite the latest version to install python libraries into ${libdir}. Signed-off-by: Chen Qi Signed-off-by: Martin Jansa Signed-off-by: Armin Kuster --- meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb b/meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb index 666ace92f..4d6318cbd 100644 --- a/meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb +++ b/meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb @@ -77,8 +77,8 @@ do_configure() { #remove the dependency of perl-shared:Makefile #or perl-shared/Makefile will be regenerated #if any code touch bindings/Makefile after below perl bindings code - sed -i -e "s:\$(PYTHON) setup.py install:\$(PYTHON) setup.py install \ - --install-lib=${D}${PYTHON_SITEPACKAGES_DIR}:" \ + sed -i -e "s:python/setup.py install:python/setup.py install \ + --install-lib=${PYTHON_SITEPACKAGES_DIR}:" \ -e "s:perl-shared/Makefile.PL Makefile:perl-shared/Makefile.PL:" \ ${B}/bindings/Makefile @@ -111,8 +111,8 @@ RDEPENDS_${PN}-perl = "perl perl-module-lib perl-module-getopt-long perl-module- DESCRIPTION_${PN}-python = \ "The ${PN}-python package includes RRDtool bindings for python." -FILES_${PN}-python = "${nonarch_libdir}/python${PYTHON_BASEVERSION}/site-packages/*" +FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" RDEPENDS_${PN}-python = "python" FILES_${PN}-dbg += "${libdir}/perl/vendor_perl/*/auto/RRDs/.debug \ - ${nonarch_libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug" + ${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug" -- cgit v1.2.3-54-g00ecf