mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-03 02:10:04 +00:00
Code Issues Projects Releases Wiki Activity

rrdtool: 1.4.8->1.5.4

Browse Source 
-deleted the patched that have been merged to 1.5.4

Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
leimaohui
2015-08-19 16:26:00 +08:00
committed by Martin Jansa
parent 937d0699f7
commit 1f2274bceb
3 changed files with 35 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-extended/rrdtool/rrdtool/0001-removing-testing-leftovers.patch
-39
View File
@@ -1,39 +0,0 @@
From c581b02d074f5a109074bc190f373f5ba4320468 Mon Sep 17 00:00:00 2001
From: Tobias Oetiker <tobi@oetiker.ch>
Date: Thu, 3 Oct 2013 15:51:00 +0200
Subject: [PATCH] removing testing leftovers
Upstream-Status: Backport
Signed-off-by: Peter A. Bigot <pab@pabigot.com>
---
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
meta-oe/recipes-extended/rrdtool/rrdtool/remove_hardcoded_xml_include.patch
-11
View File
@@ -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.])
meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb → meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb
+35 -37
View File
@@ -2,17 +2,15 @@ SUMMARY = "High performance data logging and graphing system for time series dat
HOMEPAGE = "http://oss.oetiker.ch/rrdtool/" HOMEPAGE = "http://oss.oetiker.ch/rrdtool/"
LICENSE = "GPLv2" LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=44fee82a1d2ed0676cf35478283e0aa0" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3349111ed0533471494beec99715bc9d"
DEPENDS = "libpng zlib cairo pango glib-2.0 libxml2 groff-native" DEPENDS = "libpng zlib cairo pango glib-2.0 libxml2 groff-native"
SRCREV = "1850e00a17e25e93c39e608f4e2da50f29c5c712" SRCREV = "04f70058cc894c0a3ee5d555ea1bb5a8d4bb8a0e"
PV = "1.4.8" PV = "1.5.4"
SRC_URI = "\ SRC_URI = "\
git://github.com/oetiker/rrdtool-1.x.git;branch=1.4 \ git://github.com/oetiker/rrdtool-1.x.git;branch=1.5 \
file://remove_hardcoded_xml_include.patch \
file://0001-removing-testing-leftovers.patch \
" "
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
@@ -63,43 +61,43 @@ 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)}" export PERL_ARCHLIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}"
do_configure() { do_configure() {
#fix the pkglib problem with newer automake #fix the pkglib problem with newer automake
#perl #perl
sed -i -e "s|-Wl,--rpath -Wl,\$rp||g" \ sed -i -e "s|-Wl,--rpath -Wl,\$rp||g" \
${S}/bindings/perl-shared/Makefile.PL ${S}/bindings/perl-shared/Makefile.PL
#python #python
sed -i -e '/PYTHON_INCLUDES="-I${/c \ sed -i -e '/PYTHON_INCLUDES="-I${/c \
PYTHON_INCLUDES="-I=/usr/include/python${PYTHON_BASEVERSION}"' \ PYTHON_INCLUDES="-I=/usr/include/python${PYTHON_BASEVERSION}"' \
${S}/m4/acinclude.m4 ${S}/m4/acinclude.m4
#remove the hardcoded $(libdir) rpath #remove the hardcoded $(libdir) rpath
sed -i -e 's|--rpath=$(libdir)||g' ${S}/bindings/Makefile.am sed -i -e 's|--rpath=$(libdir)||g' ${S}/bindings/Makefile.am
autotools_do_configure autotools_do_configure
#modify python sitepkg #modify python sitepkg
#remove the dependency of perl-shared:Makefile #remove the dependency of perl-shared:Makefile
#or perl-shared/Makefile will be regenerated #or perl-shared/Makefile will be regenerated
#if any code touch bindings/Makefile after below perl bindings code #if any code touch bindings/Makefile after below perl bindings code
sed -i -e "s:\$(PYTHON) setup.py install:\$(PYTHON) setup.py install \ sed -i -e "s:\$(PYTHON) setup.py install:\$(PYTHON) setup.py install \
--install-lib=${D}${PYTHON_SITEPACKAGES_DIR}:" \ --install-lib=${D}${PYTHON_SITEPACKAGES_DIR}:" \
-e "s:perl-shared/Makefile.PL Makefile:perl-shared/Makefile.PL:" \ -e "s:perl-shared/Makefile.PL Makefile:perl-shared/Makefile.PL:" \
${B}/bindings/Makefile ${B}/bindings/Makefile
#redo the perl bindings #redo the perl bindings
( (
cd ${S}/bindings/perl-shared; cd ${S}/bindings/perl-shared;
perl Makefile.PL INSTALLDIRS="vendor" INSTALLPRIVLIB="abc"; perl Makefile.PL INSTALLDIRS="vendor" INSTALLPRIVLIB="abc";
cd ../../bindings/perl-piped; cd ../../bindings/perl-piped;
perl Makefile.PL INSTALLDIRS="vendor"; perl Makefile.PL INSTALLDIRS="vendor";
) )
#change the interpreter in file #change the interpreter in file
sed -i -e "s|^PERL = ${STAGING_BINDIR_NATIVE}/.*|PERL = /usr/bin/perl|g" \ sed -i -e "s|^PERL = ${STAGING_BINDIR_NATIVE}/.*|PERL = /usr/bin/perl|g" \
${B}/examples/Makefile ${B}/examples/Makefile
sed -i -e "s|${STAGING_BINDIR_NATIVE}/perl-native/perl|/usr/bin/perl|g" \ sed -i -e "s|${STAGING_BINDIR_NATIVE}/perl-native/perl|/usr/bin/perl|g" \
${B}/examples/*.pl ${B}/examples/*.pl
} }
PACKAGES =+ "${PN}-perl ${PN}-python" PACKAGES =+ "${PN}-perl ${PN}-python"