Patchwork [V4] rrdtool: enable perl and python bindings

login
register
mail settings
Submitter Chong.Lu@windriver.com
Date April 24, 2014, 7:14 a.m.
Message ID <1398323681-19373-1-git-send-email-Chong.Lu@windriver.com>
Download mbox | patch
Permalink /patch/70835/
State Accepted, archived
Headers show

Comments

Chong.Lu@windriver.com - April 24, 2014, 7:14 a.m.
1. default enable perl and python bindings
2. rrdtool uses perl.real, perl.real doesn't know where the PERL5LIB should be
when prebuilts are used. Use the wrapper perl instead, perl sets PERL5LIB and
invokes perl.real
3. While using dash as /bin/sh, subsequent commands in functions will not use
the environment variables passed to the function call line unless explicitly
run "export ENV_VAR".
4. delete unrecognized options: "--enable-local-libpng" and "--enable-local-zlib"

Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
---
 meta-oe/recipes-extended/rrdtool/rrdtool_1.4.7.bb |  129 ++++++++++++++++++++-
 1 file changed, 123 insertions(+), 6 deletions(-)
Koen Kooi - April 24, 2014, 9:51 a.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Chong Lu schreef op 24-04-14 09:14:
> 1. default enable perl and python bindings 2. rrdtool uses perl.real,
> perl.real doesn't know where the PERL5LIB should be when prebuilts are
> used. Use the wrapper perl instead, perl sets PERL5LIB and invokes
> perl.real 3. While using dash as /bin/sh, subsequent commands in
> functions will not use the environment variables passed to the function
> call line unless explicitly run "export ENV_VAR". 4. delete unrecognized
> options: "--enable-local-libpng" and "--enable-local-zlib"
> 
> Signed-off-by: Chong Lu <Chong.Lu@windriver.com> ---

> +DESCRIPTION_${PN}-perl = \ +"The ${PN}-perl package includes RRDtool
> bindings for perl." +FILES_${PN}-perl =
> "${libdir}/perl/vendor_perl/*/*.pm ${datadir}/${PN}/examples \ +
> ${libdir}/perl/vendor_perl/*/auto/RRDs/RRDs.*" +RDEPENDS_${PN}-perl =
> "perl perl-module-lib perl-module-getopt-long perl-module-time-hires \ +
> perl-module-io-file perl-module-ipc-open2 perl-module-io-socket" 
> +RPROVIDES_${PN} += "${PN}-perl"

Why do you need RPROVIDES?


> + +DESCRIPTION_${PN}-python = \ +"The ${PN}-python package includes
> RRDtool bindings for python." +FILES_${PN}-python =
> "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" 
> +RDEPENDS_${PN}-python = "python" +RPROVIDES_${PN} += "${PN}-python"

Why do you need RPROVIDES?

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFTWN6ZMkyGM64RGpERAiAuAKCSrfa70haQRDE5fE8JNW4ggq280gCeP1Va
ZhT7mk+HdHXQQXu7MKk17jw=
=QukM
-----END PGP SIGNATURE-----
Chong.Lu@windriver.com - April 25, 2014, 1:21 a.m.
On 04/24/2014 05:51 PM, Koen Kooi wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Chong Lu schreef op 24-04-14 09:14:
>> 1. default enable perl and python bindings 2. rrdtool uses perl.real,
>> perl.real doesn't know where the PERL5LIB should be when prebuilts are
>> used. Use the wrapper perl instead, perl sets PERL5LIB and invokes
>> perl.real 3. While using dash as /bin/sh, subsequent commands in
>> functions will not use the environment variables passed to the function
>> call line unless explicitly run "export ENV_VAR". 4. delete unrecognized
>> options: "--enable-local-libpng" and "--enable-local-zlib"
>>
>> Signed-off-by: Chong Lu <Chong.Lu@windriver.com> ---
>> +DESCRIPTION_${PN}-perl = \ +"The ${PN}-perl package includes RRDtool
>> bindings for perl." +FILES_${PN}-perl =
>> "${libdir}/perl/vendor_perl/*/*.pm ${datadir}/${PN}/examples \ +
>> ${libdir}/perl/vendor_perl/*/auto/RRDs/RRDs.*" +RDEPENDS_${PN}-perl =
>> "perl perl-module-lib perl-module-getopt-long perl-module-time-hires \ +
>> perl-module-io-file perl-module-ipc-open2 perl-module-io-socket"
>> +RPROVIDES_${PN} += "${PN}-perl"
> Why do you need RPROVIDES?
>
>
>> + +DESCRIPTION_${PN}-python = \ +"The ${PN}-python package includes
>> RRDtool bindings for python." +FILES_${PN}-python =
>> "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*"
>> +RDEPENDS_${PN}-python = "python" +RPROVIDES_${PN} += "${PN}-python"
> Why do you need RPROVIDES?
If I put rrdtool-python into image.
I got following errors when I built image.
     Nothing RPROVIDES 'rrdtool-python'
So, I added RPROVIDES.

Best Regards
Chong
>
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.5 (Darwin)
> Comment: GPGTools - http://gpgtools.org
>
> iD8DBQFTWN6ZMkyGM64RGpERAiAuAKCSrfa70haQRDE5fE8JNW4ggq280gCeP1Va
> ZhT7mk+HdHXQQXu7MKk17jw=
> =QukM
> -----END PGP SIGNATURE-----
Martin Jansa - April 25, 2014, 1:33 a.m.
On Fri, Apr 25, 2014 at 09:21:44AM +0800, Chong Lu wrote:
> 
> On 04/24/2014 05:51 PM, Koen Kooi wrote:
> > -----BEGIN PGP SIGNED MESSAGE-----
> > Hash: SHA1
> >
> > Chong Lu schreef op 24-04-14 09:14:
> >> 1. default enable perl and python bindings 2. rrdtool uses perl.real,
> >> perl.real doesn't know where the PERL5LIB should be when prebuilts are
> >> used. Use the wrapper perl instead, perl sets PERL5LIB and invokes
> >> perl.real 3. While using dash as /bin/sh, subsequent commands in
> >> functions will not use the environment variables passed to the function
> >> call line unless explicitly run "export ENV_VAR". 4. delete unrecognized
> >> options: "--enable-local-libpng" and "--enable-local-zlib"
> >>
> >> Signed-off-by: Chong Lu <Chong.Lu@windriver.com> ---
> >> +DESCRIPTION_${PN}-perl = \ +"The ${PN}-perl package includes RRDtool
> >> bindings for perl." +FILES_${PN}-perl =
> >> "${libdir}/perl/vendor_perl/*/*.pm ${datadir}/${PN}/examples \ +
> >> ${libdir}/perl/vendor_perl/*/auto/RRDs/RRDs.*" +RDEPENDS_${PN}-perl =
> >> "perl perl-module-lib perl-module-getopt-long perl-module-time-hires \ +
> >> perl-module-io-file perl-module-ipc-open2 perl-module-io-socket"
> >> +RPROVIDES_${PN} += "${PN}-perl"
> > Why do you need RPROVIDES?
> >
> >
> >> + +DESCRIPTION_${PN}-python = \ +"The ${PN}-python package includes
> >> RRDtool bindings for python." +FILES_${PN}-python =
> >> "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*"
> >> +RDEPENDS_${PN}-python = "python" +RPROVIDES_${PN} += "${PN}-python"
> > Why do you need RPROVIDES?
> If I put rrdtool-python into image.
> I got following errors when I built image.
>      Nothing RPROVIDES 'rrdtool-python'
> So, I added RPROVIDES.

Doesn't it make things even worse? It can happily install "rrdtool"
package as "rrdtool-python" provider which is not what one would expect
after adding rrdtool-python to image.

You need to add rrdtool-python rrdtool-perl to PACKAGES.

Patch

diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.7.bb b/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.7.bb
index 533451f..97fb3ec 100644
--- a/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.7.bb
+++ b/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.7.bb
@@ -15,25 +15,142 @@  SRC_URI = "http://oss.oetiker.ch/rrdtool/pub/rrdtool-${PV}.tar.gz \
 SRC_URI[md5sum] = "ffe369d8921b4dfdeaaf43812100c38f"
 SRC_URI[sha256sum] = "956aaf431c955ba88dd7d98920ade3a8c4bad04adb1f9431377950a813a7af11"
 
-inherit autotools gettext
+inherit autotools gettext pythonnative perlnative python-dir
 
 EXTRA_AUTORECONF = "-I m4"
 
-PACKAGECONFIG ??= ""
+PACKAGECONFIG ??= "python perl"
+
+PACKAGECONFIG[python] = "--enable-python=yes \
+am_cv_python_pythondir=${STAGING_LIBDIR}/python${PYTHON_BASEVERSION}/site-packages \
+am_cv_python_pyexecdir=${STAGING_LIBDIR}/python${PYTHON_BASEVERSION}/site-packages,\
+--disable-python,python,"
+
+PACKAGECONFIG[perl] = \
+"--enable-perl=yes --with-perl-options='INSTALLDIRS="vendor"' \
+ac_cv_path_PERL_CC='${CC}',  \
+--disable-perl,perl,"
+
 PACKAGECONFIG[dbi] = "--enable-libdbi,--disable-libdbi,libdbi"
 
 EXTRA_OECONF = " \
     --enable-shared \
-    --enable-local-libpng \
-    --enable-local-zlib \
     --disable-libwrap \
     --program-prefix='' \
     rd_cv_ieee_works=yes \
-    --disable-perl \
-    --disable-python \
     --disable-ruby \
     --disable-lua \
     --disable-rpath \
 "
 
+# don't use perl.real, this results in break issues with prebuilts since perl.real doesn't
+# know where the PERL5LIB is...
+# use wrapper perl instead
+EXTRA_OEMAKE = "PERL=${STAGING_BINDIR_NATIVE}/perl-native/perl FULLPERL=${STAGING_BINDIR_NATIVE}/perl-native/perl"
+
+export BUILD_SYS
+export HOST_SYS
+export STAGING_LIBDIR
+export STAGING_INCDIR
+
+do_configure() {
+	#fix the pkglib problem with newer automake
+	#perl
+	sed -i -e "s|-Wl,--rpath -Wl,\$rp||g" \
+	    ${S}/bindings/perl-shared/Makefile.PL
+
+	#python
+	sed -i -e '/PYTHON_INCLUDES="-I${/c \
+	PYTHON_INCLUDES="-I=/usr/include/python${PYTHON_BASEVERSION}"' \
+	    ${S}/m4/acinclude.m4
+	#remove the hardcoded $(libdir) rpath
+	sed -i -e 's|--rpath=$(libdir)||g' ${S}/bindings/Makefile.am
+
+	autotools_do_configure
+
+	perl_version=`perl -v 2>/dev/null | \
+	    sed -n 's/This is perl.*v[a-z ]*\([0-9]\.[0-9][0-9.]*\).*$/\1/p'`
+
+	#modify python sitepkg
+	#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}:" \
+	    -e "s:perl-shared/Makefile.PL Makefile:perl-shared/Makefile.PL:" \
+	    ${S}/bindings/Makefile
+
+	#redo the perl bindings
+	(
+	cd bindings/perl-shared;
+	perl -I${STAGING_LIBDIR}/perl/$perl_version Makefile.PL INSTALLDIRS="vendor"
+	    INSTALLPRIVLIB="abc";
+	sed -i -e "s| ${libdir}/perl/| ${STAGING_LIBDIR}/perl/|g" Makefile;
+
+	cd ../../bindings/perl-piped;
+	perl -I${STAGING_LIBDIR}/perl/$perl_version Makefile.PL INSTALLDIRS="vendor";
+	sed -i -e "s| ${libdir}/perl/| ${STAGING_LIBDIR}/perl/|g" Makefile;
+	)
+
+	#change the interpreter in file
+	sed -i -e "s|^PERL = ${STAGING_BINDIR_NATIVE}/.*|PERL = /usr/bin/perl|g" \
+	    ${S}/examples/Makefile
+	sed -i -e "s|${STAGING_BINDIR_NATIVE}/perl-native/perl|/usr/bin/perl|g" \
+	    ${S}/examples/*.pl
+}
+
+python populate_packages_prepend() {
+    def fill_more(name, rdep=None):
+        if name is None or name.strip() == "":
+            return
+
+        fpack=d.getVar('PACKAGES') or ""
+        fpack="${PN}-" + name + " " + fpack
+        d.setVar('PACKAGES', fpack)
+        if rdep is not None:
+            prdep=d.getVar('RDEPENDS_${PN}-' + name) or ""
+            prdep=rdep + " " + prdep
+            d.setVar('RDEPENDS_${PN}-' + name, prdep)
+
+            prdep=d.getVar('RDEPENDS_${PN}-' + name) or ""
+            bb.debug(1, "RDEPENDS_${PN}-" + name + "=" + prdep)
+
+    conf=(d.getVar('PACKAGECONFIG', True) or "").split()
+    pack=d.getVar('PACKAGES') or ""
+    bb.debug(1, "PACKAGECONFIG=%s" % conf)
+    bb.debug(1, "PACKAGES1=%s" % pack )
+
+    if "perl" in conf :
+        fill_more("perl")
+
+    if "python" in conf:
+        fill_more("python")
+
+    pack=d.getVar('PACKAGES', True) or ""
+    bb.debug(1, "PACKAGES after=%s" % pack)
+
+    #debug code
+    #prdep=d.getVar('RDEPENDS_${PN}') or ""
+    #bb.debug(1, "RDEPENDS_${PN}" + "=" + prdep)
+    #prdep=d.getVar('RDEPENDS') or ""
+    #bb.debug(1, "RDEPENDS" + "=" + prdep)
+}
+
+FILES_${PN}-doc += "${datadir}/examples"
+
+DESCRIPTION_${PN}-perl = \
+"The ${PN}-perl package includes RRDtool bindings for perl."
+FILES_${PN}-perl = "${libdir}/perl/vendor_perl/*/*.pm ${datadir}/${PN}/examples \
+    ${libdir}/perl/vendor_perl/*/auto/RRDs/RRDs.*"
+RDEPENDS_${PN}-perl = "perl perl-module-lib perl-module-getopt-long perl-module-time-hires \
+    perl-module-io-file perl-module-ipc-open2 perl-module-io-socket"
+RPROVIDES_${PN} += "${PN}-perl"
+
+DESCRIPTION_${PN}-python = \
+"The ${PN}-python package includes RRDtool bindings for python."
+FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*"
+RDEPENDS_${PN}-python = "python"
+RPROVIDES_${PN} += "${PN}-python"
 
+FILES_${PN}-dbg += "${libdir}/perl/vendor_perl/*/auto/RRDs/.debug \
+    ${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug"