[oe-commits] Martin Dietze : rrdtool: fixed gcc options clashing with gcc 3 for nylon, refined package definition for insane. bbclass * the gcc option `-Wdeclaration-after-statement' broke the gcc 3 build, this is fixed now for nylon * the package definition ${libdir}/ perl broke the build due to QA problems, this is now replaced by the list of files actually installed

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: dbf948c5c97bc43f18c763866277ead38f05321c
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=dbf948c5c97bc43f18c763866277ead38f05321c

Author: Martin Dietze <martin at the-little-red-haired-girl.org>
Date:   Sat May 23 13:31:27 2009 +0200

rrdtool: fixed gcc options clashing with gcc 3 for nylon, refined package definition for insane.bbclass * the gcc option `-Wdeclaration-after-statement' broke the gcc 3 build, this is fixed now for nylon * the package definition ${libdir}/perl broke the build due to QA problems, this is now replaced by the list of files actually installed

---

 recipes/rrdtool/rrdtool_1.0.49.bb |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/recipes/rrdtool/rrdtool_1.0.49.bb b/recipes/rrdtool/rrdtool_1.0.49.bb
index 11968ea..f421648 100644
--- a/recipes/rrdtool/rrdtool_1.0.49.bb
+++ b/recipes/rrdtool/rrdtool_1.0.49.bb
@@ -5,13 +5,17 @@ LICENSE = "GPLv2"
 DEPENDS = "libpng zlib"
 DEPENDS_rddtool-perl = "perl-module-lib perl-module-dynaloader"
 PR = "r2"
-SRC_URI = "http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.0.x/rdtool-${PV}.tar.gz \
+SRC_URI = "http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.0.x/rrdtool-${PV}.tar.gz \
 	file://perl-make-options.diff;patch=1;pnum=0"
 
 inherit autotools
 
 EXTRA_OECONF = "--enable-shared --enable-local-libpng --enable-local-zlib --program-prefix=''"
 
+do_configure_append_nylon() {
+  perl -pi -e 's/-Wdeclaration-after-statement //g' ${S}/perl-shared/Makefile
+}
+
 do_install_append() {
 	install -d ${D}${docdir}/rrdtool/
 	mv ${D}/usr/html ${D}${docdir}/rrdtool/
@@ -24,4 +28,5 @@ do_stage () {
 	autotools_stage_all
 }
 
-FILES_${PN} += "${libdir}/perl"
+FILES_${PN} += "${libdir}/perl/auto/RRDs/RRDs.bs ${libdir}/perl/auto/RRDs/RRDs.so ${libdir}/perl/RRDs.pm ${libdir}/perl/RRDp.pm"
+