mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-17 04:37:19 +00:00
Code Issues Projects Releases Wiki Activity

poppler: fix ambiguity on math functions related to gcc-6

Browse Source 
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Derek Straka
2016-06-17 15:40:08 -04:00
committed by Martin Jansa
parent 9b9eb830b6
commit 675d1df2ef
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/poppler/poppler/0002-fix-gcc-6-math-ambiguous-errors.patch
+11
View File
@@ -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>
meta-oe/recipes-support/poppler/poppler_0.43.0.bb
+1 -3
View File
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
SRC_URI = " \ SRC_URI = " \
http://poppler.freedesktop.org/${BP}.tar.xz \ http://poppler.freedesktop.org/${BP}.tar.xz \
file://0001-add-manadatory-options-to-find-qt4-qt5-moc.patch \ 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[md5sum] = "1d2b001663119855cdfbc0713dbfb9c6"
SRC_URI[sha256sum] = "c720e26a26ee10b7ebc9e256d2ee7adcdb536cf85f9f1c4777a38f7f81fb2456" SRC_URI[sha256sum] = "c720e26a26ee10b7ebc9e256d2ee7adcdb536cf85f9f1c4777a38f7f81fb2456"
@@ -53,6 +54,3 @@ FILES_libpoppler = "${libdir}/libpoppler.so.*"
FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*" FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*"
RDEPENDS_libpoppler = "poppler-data" RDEPENDS_libpoppler = "poppler-data"
# http://errors.yoctoproject.org/Errors/Details/68605/
PNBLACKLIST[poppler] ?= "BROKEN: fails to build with gcc-6"