From 1f2274bcebcbfc5ce3c49cbe5bbfbd8b4674ea95 Mon Sep 17 00:00:00 2001 From: leimaohui Date: Wed, 19 Aug 2015 16:26:00 +0800 Subject: rrdtool: 1.4.8->1.5.4 -deleted the patched that have been merged to 1.5.4 Signed-off-by: Lei Maohui Signed-off-by: Martin Jansa --- .../rrdtool/0001-removing-testing-leftovers.patch | 39 ------- .../rrdtool/remove_hardcoded_xml_include.patch | 11 -- meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb | 122 --------------------- meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb | 120 ++++++++++++++++++++ 4 files changed, 120 insertions(+), 172 deletions(-) delete mode 100644 meta-oe/recipes-extended/rrdtool/rrdtool/0001-removing-testing-leftovers.patch delete mode 100644 meta-oe/recipes-extended/rrdtool/rrdtool/remove_hardcoded_xml_include.patch delete mode 100644 meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb create mode 100644 meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool/0001-removing-testing-leftovers.patch b/meta-oe/recipes-extended/rrdtool/rrdtool/0001-removing-testing-leftovers.patch deleted file mode 100644 index cf5d7752e5..0000000000 --- a/meta-oe/recipes-extended/rrdtool/rrdtool/0001-removing-testing-leftovers.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c581b02d074f5a109074bc190f373f5ba4320468 Mon Sep 17 00:00:00 2001 -From: Tobias Oetiker -Date: Thu, 3 Oct 2013 15:51:00 +0200 -Subject: [PATCH] removing testing leftovers - -Upstream-Status: Backport - -Signed-off-by: Peter A. Bigot - ---- - bindings/perl-piped/leaktest.pl | 16 ---------------- - 1 file changed, 16 deletions(-) - delete mode 100644 bindings/perl-piped/leaktest.pl - -diff --git a/bindings/perl-piped/leaktest.pl b/bindings/perl-piped/leaktest.pl -deleted file mode 100644 -index cebf1c7..0000000 ---- a/bindings/perl-piped/leaktest.pl -+++ /dev/null -@@ -1,16 +0,0 @@ --#!/bin/perl -w --$ENV{PATH}="/usr/ucb"; --use strict; --use RRDp; --my $rrdfile='/tmp/test.rrd'; --RRDp::start '/home/oetiker/data/projects/AABN-rrdtool/src/rrdtool'; --print grep /rrdtool/,`ps au`; --print grep /rrdtool/,`ps au`; --my $i=0; --while ($i<1000) { -- RRDp::cmd 'info /tmp/test.rrd'; -- $_ = RRDp::read; -- $i++; --} --$_ = RRDp::end; --print grep /rrdtool/,`ps au`; --- -1.8.5.5 - diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool/remove_hardcoded_xml_include.patch b/meta-oe/recipes-extended/rrdtool/rrdtool/remove_hardcoded_xml_include.patch deleted file mode 100644 index 321a842b62..0000000000 --- a/meta-oe/recipes-extended/rrdtool/rrdtool/remove_hardcoded_xml_include.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac 2012-11-06 11:20:54.099021892 -0500 -+++ b/configure.ac~ 2012-11-06 11:19:57.255023857 -0500 -@@ -548,7 +548,7 @@ - - fi - EX_CHECK_ALL(glib-2.0, glib_check_version, glib.h, glib-2.0, 2.28.7, ftp://ftp.gtk.org/pub/glib/2.28/, "") --EX_CHECK_ALL(xml2, xmlParseFile, libxml/parser.h, libxml-2.0, 2.7.8, http://xmlsoft.org/downloads.html, /usr/include/libxml2) -+EX_CHECK_ALL(xml2, xmlParseFile, libxml/parser.h, libxml-2.0, 2.7.8, http://xmlsoft.org/downloads.html, "") - - if test "$EX_CHECK_ALL_ERR" = "YES"; then - AC_MSG_ERROR([Please fix the library issues listed above and try again.]) diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb b/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb deleted file mode 100644 index 6bc5e98633..0000000000 --- a/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb +++ /dev/null @@ -1,122 +0,0 @@ -SUMMARY = "High performance data logging and graphing system for time series data" -HOMEPAGE = "http://oss.oetiker.ch/rrdtool/" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=44fee82a1d2ed0676cf35478283e0aa0" - -DEPENDS = "libpng zlib cairo pango glib-2.0 libxml2 groff-native" - -SRCREV = "1850e00a17e25e93c39e608f4e2da50f29c5c712" -PV = "1.4.8" - -SRC_URI = "\ - git://github.com/oetiker/rrdtool-1.x.git;branch=1.4 \ - file://remove_hardcoded_xml_include.patch \ - file://0001-removing-testing-leftovers.patch \ -" - -S = "${WORKDIR}/git" - -inherit autotools-brokensep gettext pythonnative perlnative python-dir cpan-base - -EXTRA_AUTORECONF = "-I m4" - -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 \ - --disable-libwrap \ - --program-prefix='' \ - rd_cv_ieee_works=yes \ - --disable-ruby \ - --disable-lua \ - --disable-tcl \ - --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 - -# Env var which tells perl if it should use host (no) or target (yes) settings -export PERLCONFIGTARGET = "${@is_target(d)}" -export PERL_INC = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}/CORE" -export PERL_LIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}" -export PERL_ARCHLIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}" - -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 - - #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:" \ - ${B}/bindings/Makefile - - #redo the perl bindings - ( - cd ${S}/bindings/perl-shared; - perl Makefile.PL INSTALLDIRS="vendor" INSTALLPRIVLIB="abc"; - - cd ../../bindings/perl-piped; - perl Makefile.PL INSTALLDIRS="vendor"; - ) - - #change the interpreter in file - sed -i -e "s|^PERL = ${STAGING_BINDIR_NATIVE}/.*|PERL = /usr/bin/perl|g" \ - ${B}/examples/Makefile - sed -i -e "s|${STAGING_BINDIR_NATIVE}/perl-native/perl|/usr/bin/perl|g" \ - ${B}/examples/*.pl -} - -PACKAGES =+ "${PN}-perl ${PN}-python" - -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}/rrdtool/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" diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb b/meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb new file mode 100644 index 0000000000..91a30cf3df --- /dev/null +++ b/meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb @@ -0,0 +1,120 @@ +SUMMARY = "High performance data logging and graphing system for time series data" +HOMEPAGE = "http://oss.oetiker.ch/rrdtool/" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3349111ed0533471494beec99715bc9d" + +DEPENDS = "libpng zlib cairo pango glib-2.0 libxml2 groff-native" + +SRCREV = "04f70058cc894c0a3ee5d555ea1bb5a8d4bb8a0e" +PV = "1.5.4" + +SRC_URI = "\ + git://github.com/oetiker/rrdtool-1.x.git;branch=1.5 \ +" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep gettext pythonnative perlnative python-dir cpan-base + +EXTRA_AUTORECONF = "-I m4" + +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 \ + --disable-libwrap \ + --program-prefix='' \ + rd_cv_ieee_works=yes \ + --disable-ruby \ + --disable-lua \ + --disable-tcl \ + --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 + +# Env var which tells perl if it should use host (no) or target (yes) settings +export PERLCONFIGTARGET = "${@is_target(d)}" +export PERL_INC = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}/CORE" +export PERL_LIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}" +export PERL_ARCHLIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}" + +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 + + #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:" \ + ${B}/bindings/Makefile + + #redo the perl bindings + ( + cd ${S}/bindings/perl-shared; + perl Makefile.PL INSTALLDIRS="vendor" INSTALLPRIVLIB="abc"; + + cd ../../bindings/perl-piped; + perl Makefile.PL INSTALLDIRS="vendor"; + ) + + #change the interpreter in file + sed -i -e "s|^PERL = ${STAGING_BINDIR_NATIVE}/.*|PERL = /usr/bin/perl|g" \ + ${B}/examples/Makefile + sed -i -e "s|${STAGING_BINDIR_NATIVE}/perl-native/perl|/usr/bin/perl|g" \ + ${B}/examples/*.pl +} + +PACKAGES =+ "${PN}-perl ${PN}-python" + +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}/rrdtool/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" -- cgit v1.2.3-54-g00ecf