diff options
author | Qi.Chen@windriver.com <Qi.Chen@windriver.com> | 2015-11-09 09:34:20 +0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-12-18 12:43:22 +0100 |
commit | 626236af04f23b9c6beef59e64274655348cfa4b (patch) | |
tree | 40b5adc1ed12269b7930a0ad8491112987e3f426 /meta-oe | |
parent | 501425295d90406182789cce96400f53e2f79a64 (diff) | |
download | meta-openembedded-626236af04f23b9c6beef59e64274655348cfa4b.tar.gz |
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 <Qi.Chen@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb | 8 |
1 files 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() { | |||
77 | #remove the dependency of perl-shared:Makefile | 77 | #remove the dependency of perl-shared:Makefile |
78 | #or perl-shared/Makefile will be regenerated | 78 | #or perl-shared/Makefile will be regenerated |
79 | #if any code touch bindings/Makefile after below perl bindings code | 79 | #if any code touch bindings/Makefile after below perl bindings code |
80 | sed -i -e "s:\$(PYTHON) setup.py install:\$(PYTHON) setup.py install \ | 80 | sed -i -e "s:python/setup.py install:python/setup.py install \ |
81 | --install-lib=${D}${PYTHON_SITEPACKAGES_DIR}:" \ | 81 | --install-lib=${PYTHON_SITEPACKAGES_DIR}:" \ |
82 | -e "s:perl-shared/Makefile.PL Makefile:perl-shared/Makefile.PL:" \ | 82 | -e "s:perl-shared/Makefile.PL Makefile:perl-shared/Makefile.PL:" \ |
83 | ${B}/bindings/Makefile | 83 | ${B}/bindings/Makefile |
84 | 84 | ||
@@ -111,8 +111,8 @@ RDEPENDS_${PN}-perl = "perl perl-module-lib perl-module-getopt-long perl-module- | |||
111 | 111 | ||
112 | DESCRIPTION_${PN}-python = \ | 112 | DESCRIPTION_${PN}-python = \ |
113 | "The ${PN}-python package includes RRDtool bindings for python." | 113 | "The ${PN}-python package includes RRDtool bindings for python." |
114 | FILES_${PN}-python = "${nonarch_libdir}/python${PYTHON_BASEVERSION}/site-packages/*" | 114 | FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" |
115 | RDEPENDS_${PN}-python = "python" | 115 | RDEPENDS_${PN}-python = "python" |
116 | 116 | ||
117 | FILES_${PN}-dbg += "${libdir}/perl/vendor_perl/*/auto/RRDs/.debug \ | 117 | FILES_${PN}-dbg += "${libdir}/perl/vendor_perl/*/auto/RRDs/.debug \ |
118 | ${nonarch_libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug" | 118 | ${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug" |