poppler: Add option for Qt5 support
cover poppler: Add option for Qt5 support
This explicitly adds poppler support for qt5. Since we depend on qt5 we dont need to depend on individual toolchain requirements for Qt5. However for supporting Qt >= 5.7 we need to use the -std=c++11 compiler option.
Should fix:
http://autobuild.buildroot.net/results/359/35916f2a34ec45ced3e30a25a680cbaa3a0aba6f/
Andreas Naumann (1):
poppler: qt5 support needs c++11 (since Qt5.7)
Jens Kleintje (1):
poppler: Add option for Qt5 support
package/poppler/Config.in | 9 +++++++++ package/poppler/poppler.mk | 11 +++++++++++ 2 files changed, 20 insertions(+)
Signature · 1 line
1.9.1
PATCH 1/2 poppler: Add option for Qt5 support
From: Jens Kleintje <[email protected]>
Add an option to build the libpoppler-qt5 library.
--- package/poppler/Config.in | 9 +++++++++ package/poppler/poppler.mk | 7 +++++++ 2 files changed, 16 insertions(+)
package/poppler/Config.in +9 -0
@@ -24,6 +24,15 @@ config BR2_PACKAGE_POPPLER_QT comment "poppler Qt support needs a toolchain not affected by Binutils bug 19405" depends on BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 +config BR2_PACKAGE_POPPLER_QT5 + bool "Qt5 support" + depends on BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5BASE_WIDGETS + select BR2_PACKAGE_QT5BASE_XML + help + Build Qt support into the Poppler library + endif comment "poppler needs a toolchain w/ C++, threads"
package/poppler/poppler.mk +7 -0
@@ -87,6 +87,13 @@ else POPPLER_CONF_OPTS += --disable-poppler-qt4 endif +ifeq ($(BR2_PACKAGE_POPPLER_QT5),y) +POPPLER_DEPENDENCIES += qt5base +POPPLER_CONF_OPTS += --enable-poppler-qt5 +else +POPPLER_CONF_OPTS += --disable-poppler-qt5 +endif + ifeq ($(BR2_PACKAGE_OPENJPEG),y) POPPLER_DEPENDENCIES += openjpeg POPPLER_CONF_OPTS += --enable-libopenjpeg
Signature · 1 line
1.9.1
PATCH 2/2 poppler: qt5 support needs c++11 (since Qt5.7)
In reply to Andreas Naumann--- package/poppler/poppler.mk | 4 ++++ 1 file changed, 4 insertions(+)
package/poppler/poppler.mk +4 -0
@@ -90,6 +90,10 @@ endif ifeq ($(BR2_PACKAGE_POPPLER_QT5),y) POPPLER_DEPENDENCIES += qt5base POPPLER_CONF_OPTS += --enable-poppler-qt5 +# since Qt5.7.x c++11 is needed (LTS Qt5.6.x is the last one without this requirement) +ifneq ($(BR2_QT5_VERSION_5_6),y) +POPPLER_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" +endif else POPPLER_CONF_OPTS += --disable-poppler-qt5 endif
Signature · 1 line
1.9.1
PATCH 2/2 poppler: qt5 support needs c++11 (since Qt5.7)
Hello,
package/poppler/poppler.mk endif · line 94
Quoted 2 lines · Andreas Naumann
package/poppler/poppler.mk +2
-0+# since Qt5.7.x c++11 is needed (LTS Qt5.6.x is the last one without this requirement) +ifneq ($(BR2_QT5_VERSION_5_6),y)
Reviewing lead me to realize that we did a mistake when naming those options. They should be named BR2_PACKAGE_QT5_VERSION_XYZ, and not BR2_QT5_VERSION_XYZ.
We want to fix this before 2017.02 is released.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
PATCH 2/2 poppler: qt5 support needs c++11 (since Qt5.7)
Hi,
Am 10.02.2017 um 16:39 schrieb Thomas Petazzoni:
Quoted 10 lines
Hello,
package/poppler/poppler.mk endif · line 94
Quoted 2 lines · Andreas Naumann
package/poppler/poppler.mk +2
-0+# since Qt5.7.x c++11 is needed (LTS Qt5.6.x is the last one without this requirement) +ifneq ($(BR2_QT5_VERSION_5_6),y)Reviewing lead me to realize that we did a mistake when naming those options. They should be named
BR2_PACKAGE_QT5_VERSION_XYZ, and notBR2_QT5_VERSION_XYZ.
Ok, I'll resend this including the option rename as first patch.
regards,
Andreas
Quoted 5 lines
We want to fix this before 2017.02 is released.
Thomas