aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Ferland <ferlandm@sonatest.com>2012-11-06 17:04:32 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-11-29 11:03:35 +0100
commit946c52ccf1cbdaa1d6337486e9ac3a1b0f3bb8a5 (patch)
tree49fd493809333c9d4c0aef2436191d8f2ab919d6
parent5b62eff1d759bbf27a6548f4ccefa0573a4d36c3 (diff)
downloadmeta-openembedded-contrib-946c52ccf1cbdaa1d6337486e9ac3a1b0f3bb8a5.tar.gz
meta-openembedded-contrib-946c52ccf1cbdaa1d6337486e9ac3a1b0f3bb8a5.tar.bz2
meta-openembedded-contrib-946c52ccf1cbdaa1d6337486e9ac3a1b0f3bb8a5.zip
rrdtool: Remove hard-coded include in configure.ac
Got an error building rrdtool because of hard-coded paths in the configure.ac file. The extact error message was: ERROR: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities. Rerun configure task after fixing this. The path was '/home/marc/yoctomaster/build/crownbay/tmp/work/core2-poky-linux/rrdtool-1.4.7-r2/rrdtool-1.4.7' Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-rw-r--r--meta-oe/recipes-extended/rrdtool/rrdtool/remove_hardcoded_xml_include.patch11
-rw-r--r--meta-oe/recipes-extended/rrdtool/rrdtool_1.4.7.bb3
2 files changed, 13 insertions, 1 deletions
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
new file mode 100644
index 0000000000..321a842b62
--- /dev/null
+++ b/meta-oe/recipes-extended/rrdtool/rrdtool/remove_hardcoded_xml_include.patch
@@ -0,0 +1,11 @@
+--- 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.7.bb b/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.7.bb
index 73141b4645..465ef8a18f 100644
--- a/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.7.bb
+++ b/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.7.bb
@@ -6,10 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=44fee82a1d2ed0676cf35478283e0aa0"
DEPENDS = "libpng zlib cairo pango glib-2.0 libxml2"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://oss.oetiker.ch/rrdtool/pub/rrdtool-${PV}.tar.gz \
file://0001-rrdtool-eradicate-tcl-support.patch \
+ file://remove_hardcoded_xml_include.patch \
"
SRC_URI[md5sum] = "ffe369d8921b4dfdeaaf43812100c38f"
SRC_URI[sha256sum] = "956aaf431c955ba88dd7d98920ade3a8c4bad04adb1f9431377950a813a7af11"