diff options
| author |   Derek Straka <derek@asterius.io> | 2016-06-17 15:40:08 -0400 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2016-06-23 15:20:05 +0200 |
| commit | 675d1df2efe89bd22cab9e0206e86d5554b443e9 (patch) | |
| tree | 0a5846bd14632de8279cddd5368091f8a9da693c | |
| parent | 9b9eb830b60a0564e7f5b00eb12a57e652484227 (diff) | |
| download | meta-openembedded-contrib-675d1df2efe89bd22cab9e0206e86d5554b443e9.tar.gz | |
poppler: fix ambiguity on math functions related to gcc-6
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/poppler/poppler/0002-fix-gcc-6-math-ambiguous-errors.patch | 11 | ||||
| -rw-r--r-- | meta-oe/recipes-support/poppler/poppler_0.43.0.bb | 4 |
2 files changed, 12 insertions, 3 deletions
diff --git a/meta-oe/recipes-support/poppler/poppler/0002-fix-gcc-6-math-ambiguous-errors.patch b/meta-oe/recipes-support/poppler/poppler/0002-fix-gcc-6-math-ambiguous-errors.patch new file mode 100644 index 0000000000..406009f4fa --- /dev/null +++ b/meta-oe/recipes-support/poppler/poppler/0002-fix-gcc-6-math-ambiguous-errors.patch @@ -0,0 +1,11 @@ +--- poppler-0.45.0/poppler/CairoOutputDev.cc.orig 2016-06-17 14:23:35.399083929 -0400 ++++ poppler-0.45.0/poppler/CairoOutputDev.cc 2016-06-17 14:36:53.351097825 -0400 +@@ -42,7 +42,7 @@ + #endif + + #include <string.h> +-#include <math.h> ++#include <cmath> + #include <assert.h> + #include <cairo.h> + diff --git a/meta-oe/recipes-support/poppler/poppler_0.43.0.bb b/meta-oe/recipes-support/poppler/poppler_0.43.0.bb index 743e0aaa0f..9abcd2ca87 100644 --- a/meta-oe/recipes-support/poppler/poppler_0.43.0.bb +++ b/meta-oe/recipes-support/poppler/poppler_0.43.0.bb @@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SRC_URI = " \ http://poppler.freedesktop.org/${BP}.tar.xz \ file://0001-add-manadatory-options-to-find-qt4-qt5-moc.patch \ + file://0002-fix-gcc-6-math-ambiguous-errors.patch \ " SRC_URI[md5sum] = "1d2b001663119855cdfbc0713dbfb9c6" SRC_URI[sha256sum] = "c720e26a26ee10b7ebc9e256d2ee7adcdb536cf85f9f1c4777a38f7f81fb2456" @@ -53,6 +54,3 @@ FILES_libpoppler = "${libdir}/libpoppler.so.*" FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*" RDEPENDS_libpoppler = "poppler-data" - -# http://errors.yoctoproject.org/Errors/Details/68605/ -PNBLACKLIST[poppler] ?= "BROKEN: fails to build with gcc-6" |