aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/poppler/poppler_0.33.0.bb
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2015-05-26 13:07:13 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2015-05-28 10:35:16 +0200
commit2538cf6f7b2ed384b3880fee2942b7287acfa9d4 (patch)
tree1a86eca1ec2b40c1a9f91b6d036a4d8cb4091dc4 /meta-oe/recipes-support/poppler/poppler_0.33.0.bb
parentbb09fdb283a913dc641247a8d25bad261d3fc71e (diff)
downloadmeta-openembedded-contrib-2538cf6f7b2ed384b3880fee2942b7287acfa9d4.tar.gz
poppler: fix configure by pointing on moc
As discussed in [1] configure was detecting host's moc and failing in some configurations. To get this fixed configure gets a parameter by which the location of moc is set. [1] http://lists.openembedded.org/pipermail/openembedded-devel/2015-May/101641.html Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Diffstat (limited to 'meta-oe/recipes-support/poppler/poppler_0.33.0.bb')
-rw-r--r--meta-oe/recipes-support/poppler/poppler_0.33.0.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/poppler/poppler_0.33.0.bb b/meta-oe/recipes-support/poppler/poppler_0.33.0.bb
index 6e8446b872..d5362a0588 100644
--- a/meta-oe/recipes-support/poppler/poppler_0.33.0.bb
+++ b/meta-oe/recipes-support/poppler/poppler_0.33.0.bb
@@ -4,6 +4,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 \
"
SRC_URI[md5sum] = "69927d1614d6704021c0b0dd0ee6a852"
SRC_URI[sha256sum] = "a5fa6d7f7dc5382b48caca82b147c54bdffda02698611af76db5326ba64995a6"
@@ -18,7 +19,7 @@ PACKAGECONFIG[png] = "--enable-libpng,--disable-libpng,libpng"
PACKAGECONFIG[tiff] = "--enable-libtiff,--disable-libtiff,tiff"
PACKAGECONFIG[curl] = "--enable-libcurl,--disable-libcurl,curl"
PACKAGECONFIG[openjpeg] = "--enable-libopenjpeg=openjpeg2,--disable-libopenjpeg,openjpeg"
-PACKAGECONFIG[qt5] = "--enable-poppler-qt5,--disable-poppler-qt5,qtbase"
+PACKAGECONFIG[qt5] = "--enable-poppler-qt5 --with-moc-qt5=${STAGING_BINDIR_NATIVE}/qt5/moc,--disable-poppler-qt5,qtbase"
EXTRA_OECONF = "\
--enable-xpdf-headers \