* [PATCH V6] rrdtool: enable perl and python bindings
@ 2014-04-29 7:22 Chong Lu
2014-04-29 7:45 ` Koen Kooi
0 siblings, 1 reply; 3+ messages in thread
From: Chong Lu @ 2014-04-29 7:22 UTC (permalink / raw)
To: openembedded-devel
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 | 92 +++++++++++++++++++--
1 file changed, 86 insertions(+), 6 deletions(-)
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..e337529 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,105 @@ 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"
+
+PACKAGES += "${PN}-perl ${PN}-python"
+
+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
+}
+
+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"
+
+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"
+FILES_${PN}-dbg += "${libdir}/perl/vendor_perl/*/auto/RRDs/.debug \
+ ${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH V6] rrdtool: enable perl and python bindings
2014-04-29 7:22 [PATCH V6] rrdtool: enable perl and python bindings Chong Lu
@ 2014-04-29 7:45 ` Koen Kooi
2014-04-29 7:55 ` Chong Lu
0 siblings, 1 reply; 3+ messages in thread
From: Koen Kooi @ 2014-04-29 7:45 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Chong Lu schreef op 29-04-14 09:22:
> 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 | 92
> +++++++++++++++++++-- 1 file changed, 86 insertions(+), 6 deletions(-)
>
> 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..e337529 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,105 @@
> SRC_URI = "http://oss.oetiker.ch/rrdtool/pub/rrdtool-${PV}.tar.gz \
> +PACKAGES += "${PN}-perl ${PN}-python"
That needs to move below do_install, since it's a packaging var
(PACKAGE_CONFIG is actually recipe-config, so those go above do_configure).
Also, do you need =+ here instead of +=?
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFTX1iBMkyGM64RGpERAg1aAJ0YiuDvRTjWQzenMhHx9RSdCmW1aQCdF/zD
Ow07E6UIg9o56HoTzQrQ14U=
=fzFu
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH V6] rrdtool: enable perl and python bindings
2014-04-29 7:45 ` Koen Kooi
@ 2014-04-29 7:55 ` Chong Lu
0 siblings, 0 replies; 3+ messages in thread
From: Chong Lu @ 2014-04-29 7:55 UTC (permalink / raw)
To: openembedded-devel
On 04/29/2014 03:45 PM, Koen Kooi wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Chong Lu schreef op 29-04-14 09:22:
>> 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 | 92
>> +++++++++++++++++++-- 1 file changed, 86 insertions(+), 6 deletions(-)
>>
>> 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..e337529 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,105 @@
>> SRC_URI = "http://oss.oetiker.ch/rrdtool/pub/rrdtool-${PV}.tar.gz \
>> +PACKAGES += "${PN}-perl ${PN}-python"
> That needs to move below do_install, since it's a packaging var
> (PACKAGE_CONFIG is actually recipe-config, so those go above do_configure).
> Also, do you need =+ here instead of +=?
Ok, thanks.
=+ is better here.
Chong
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.5 (Darwin)
> Comment: GPGTools - http://gpgtools.org
>
> iD8DBQFTX1iBMkyGM64RGpERAg1aAJ0YiuDvRTjWQzenMhHx9RSdCmW1aQCdF/zD
> Ow07E6UIg9o56HoTzQrQ14U=
> =fzFu
> -----END PGP SIGNATURE-----
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-04-29 7:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-29 7:22 [PATCH V6] rrdtool: enable perl and python bindings Chong Lu
2014-04-29 7:45 ` Koen Kooi
2014-04-29 7:55 ` Chong Lu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.