NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
958fa56ebf
kumquat-buildroot/package/qt5/qt5webkit/qt5webkit.mk

72 lines
2.2 KiB
Makefile
Raw Normal View History

qt5webkit: restore package Although this package has been removed from the official release packages since Qt5.6.0, it is still available for users to build it from source. This is useful for platforms without GPU since its successor (QtWebEngine) requires OpenGL support. The package now matches the community-based meta-qt5 Yocto layer, using the exact same revision of the qtwebkit source from github: https://github.com/meta-qt5/meta-qt5/commit/e434995a Here is the project source tree: https://github.com/qtproject/qtwebkit All the patches have been pulled from Yocto as well. Since we are now using the source from the git repository, we need to create an empty .git/ folder to force the headers re-generation. https://github.com/meta-qt5/meta-qt5/blob/jethro/recipes-qt/qt5/qt5.inc#L33 Note that GPLv3 license option has been added with this release. Reviewed-by: Julien Corjon <corjon.j@ecagroup.com> Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com> [Thomas: fix license to be LGPLv2.1+, not LGPLv2+.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-04-13 15:40:35 +02:00
################################################################################
#
# qt5webkit
#
################################################################################
qt5: bump latest version to 5.9.2 qt5base: - removed 0001-Fix-error-attribute-target-crc-is-unknown.patch (upstream committed, see [1]) - removed 0002-examples-fix-compile-without-opengl-support.patch (upstream committed, see [2]) qt5declarative: - removed 0001-Fix-alignment-issue-on-ARMv7.patch (upstream committed, see [3]) - moved 0001-examples-photoviewer-needs-widgets-support.patch to 5.6.2 only (upstream 5.9.2 committed, see [4]) - moved 0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch to 5.6.2 only (similare patch upstream committed, see [5]) qt5location: - removed 0001-Fix-plugins-build-dependency.patch (upstream committed, see [6]) qt5webchannel: - fix webchannel.js installation to target (the locatinon of the file webchannel.js changed from src/webchannel/qwebchannel.js to examples/webchannel/shared/qwebchannel.js, see commit [7]) qt5webengine: - removed 0001-Always-compile-QWebEnginePage-print.patch (upstream committed, see [8]) - keep 0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch (upstream committed, see [9], but reverted afterwards, see [10]) qt5webkit: - fall back to 5.9.1 (no 5.9.2 package provided, see [11] and [12]). [1] http://code.qt.io/cgit/qt/qtbase.git/commit/?id=b7722c251c3a0938c7c71fc3da47fdbe920060b7 [2] http://code.qt.io/cgit/qt/qtbase.git/commit/?id=6ce4b680cdde7827a6ed4d00dbeb7e7e91569433 [3] http://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=03c2661b1243cc529fc3d8cfa65073f1da420307 [4] http://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=452a78d0ac4a1579733a8ab641be24c9b7c0dd96 [5] http://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=fa52bb665d6beb77a951c14c8edcba3541850afc [6] http://code.qt.io/cgit/qt/qtlocation.git/commit/?id=3ac051c4549575634cecc706175b019f4ed4c3bf [7] https://code.qt.io/cgit/qt/qtwebchannel.git/commit/?id=e7f150abaa8e81d3e404e9631a49341a7f7623d1 [8] http://code.qt.io/cgit/qt/qtwebengine.git/commit/?id=085c2c529473bbe9dd7c8c5698a45053520cc423 [9] http://code.qt.io/cgit/qt/qtwebengine.git/commit/?id=d4c621f6a6b87f2a86069fa393b9f7c4f9e7b9ad [10] http://code.qt.io/cgit/qt/qtwebengine.git/commit/?id=c11c2c8981e647c1eb2c6753ce77d436b92fff87 [11] https://blog.qt.io/blog/2017/10/06/qt-5-9-2-released/#comment-1200724 [12] https://blog.qt.io/blog/2017/10/06/qt-5-9-2-released/#comment-1200746 Signed-off-by: Peter Seiderer <ps.report@gmx.net> Tested-by: Joshua Henderson <joshua.henderson@microchip.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-10-17 22:28:03 +02:00
# no 5.9.2 package available, fall back to 5.9.1 version
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5WEBKIT_VERSION = 5.9.1
qt5: fetch sources using https URLs Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-02-14 00:16:45 +01:00
QT5WEBKIT_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules
qt5: bump latest version to 5.9.2 qt5base: - removed 0001-Fix-error-attribute-target-crc-is-unknown.patch (upstream committed, see [1]) - removed 0002-examples-fix-compile-without-opengl-support.patch (upstream committed, see [2]) qt5declarative: - removed 0001-Fix-alignment-issue-on-ARMv7.patch (upstream committed, see [3]) - moved 0001-examples-photoviewer-needs-widgets-support.patch to 5.6.2 only (upstream 5.9.2 committed, see [4]) - moved 0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch to 5.6.2 only (similare patch upstream committed, see [5]) qt5location: - removed 0001-Fix-plugins-build-dependency.patch (upstream committed, see [6]) qt5webchannel: - fix webchannel.js installation to target (the locatinon of the file webchannel.js changed from src/webchannel/qwebchannel.js to examples/webchannel/shared/qwebchannel.js, see commit [7]) qt5webengine: - removed 0001-Always-compile-QWebEnginePage-print.patch (upstream committed, see [8]) - keep 0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch (upstream committed, see [9], but reverted afterwards, see [10]) qt5webkit: - fall back to 5.9.1 (no 5.9.2 package provided, see [11] and [12]). [1] http://code.qt.io/cgit/qt/qtbase.git/commit/?id=b7722c251c3a0938c7c71fc3da47fdbe920060b7 [2] http://code.qt.io/cgit/qt/qtbase.git/commit/?id=6ce4b680cdde7827a6ed4d00dbeb7e7e91569433 [3] http://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=03c2661b1243cc529fc3d8cfa65073f1da420307 [4] http://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=452a78d0ac4a1579733a8ab641be24c9b7c0dd96 [5] http://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=fa52bb665d6beb77a951c14c8edcba3541850afc [6] http://code.qt.io/cgit/qt/qtlocation.git/commit/?id=3ac051c4549575634cecc706175b019f4ed4c3bf [7] https://code.qt.io/cgit/qt/qtwebchannel.git/commit/?id=e7f150abaa8e81d3e404e9631a49341a7f7623d1 [8] http://code.qt.io/cgit/qt/qtwebengine.git/commit/?id=085c2c529473bbe9dd7c8c5698a45053520cc423 [9] http://code.qt.io/cgit/qt/qtwebengine.git/commit/?id=d4c621f6a6b87f2a86069fa393b9f7c4f9e7b9ad [10] http://code.qt.io/cgit/qt/qtwebengine.git/commit/?id=c11c2c8981e647c1eb2c6753ce77d436b92fff87 [11] https://blog.qt.io/blog/2017/10/06/qt-5-9-2-released/#comment-1200724 [12] https://blog.qt.io/blog/2017/10/06/qt-5-9-2-released/#comment-1200746 Signed-off-by: Peter Seiderer <ps.report@gmx.net> Tested-by: Joshua Henderson <joshua.henderson@microchip.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-10-17 22:28:03 +02:00
else
qt5webkit: get source code from Qt5 unofficial builds Instead of messing with git we can get tarballs of obsolete but still existing Qt5 submodules as we used to but from a bit different location. It turned out Qt people still create packages for obsolete submodules for so-called "unofficial builds", see [1]. [1] https://wiki.qt.io/Qt-5-unofficial-builds Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> Cc: Yegor Yefremov <yegorslists@googlemail.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Peter Seiderer <ps.report@gmx.net> Cc: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net> Cc: Peter Korsgaard <peter@korsgaard.com> Cc: Julien Corjon <corjon.j@ecagroup.com> Cc: Gary Bisson <gary.bisson@boundarydevices.com> Cc: Jérôme Pouiller <jezz@sysmic.org> Reviewed-by: Julien Corjon <corjon.j@ecagroup.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-11-09 14:59:54 +01:00
QT5WEBKIT_VERSION = $(QT5_VERSION)
qt5: fetch sources using https URLs Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-02-14 00:16:45 +01:00
QT5WEBKIT_SITE = https://download.qt.io/community_releases/5.6/$(QT5_VERSION)
qt5: bump latest version to 5.9.2 qt5base: - removed 0001-Fix-error-attribute-target-crc-is-unknown.patch (upstream committed, see [1]) - removed 0002-examples-fix-compile-without-opengl-support.patch (upstream committed, see [2]) qt5declarative: - removed 0001-Fix-alignment-issue-on-ARMv7.patch (upstream committed, see [3]) - moved 0001-examples-photoviewer-needs-widgets-support.patch to 5.6.2 only (upstream 5.9.2 committed, see [4]) - moved 0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch to 5.6.2 only (similare patch upstream committed, see [5]) qt5location: - removed 0001-Fix-plugins-build-dependency.patch (upstream committed, see [6]) qt5webchannel: - fix webchannel.js installation to target (the locatinon of the file webchannel.js changed from src/webchannel/qwebchannel.js to examples/webchannel/shared/qwebchannel.js, see commit [7]) qt5webengine: - removed 0001-Always-compile-QWebEnginePage-print.patch (upstream committed, see [8]) - keep 0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch (upstream committed, see [9], but reverted afterwards, see [10]) qt5webkit: - fall back to 5.9.1 (no 5.9.2 package provided, see [11] and [12]). [1] http://code.qt.io/cgit/qt/qtbase.git/commit/?id=b7722c251c3a0938c7c71fc3da47fdbe920060b7 [2] http://code.qt.io/cgit/qt/qtbase.git/commit/?id=6ce4b680cdde7827a6ed4d00dbeb7e7e91569433 [3] http://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=03c2661b1243cc529fc3d8cfa65073f1da420307 [4] http://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=452a78d0ac4a1579733a8ab641be24c9b7c0dd96 [5] http://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=fa52bb665d6beb77a951c14c8edcba3541850afc [6] http://code.qt.io/cgit/qt/qtlocation.git/commit/?id=3ac051c4549575634cecc706175b019f4ed4c3bf [7] https://code.qt.io/cgit/qt/qtwebchannel.git/commit/?id=e7f150abaa8e81d3e404e9631a49341a7f7623d1 [8] http://code.qt.io/cgit/qt/qtwebengine.git/commit/?id=085c2c529473bbe9dd7c8c5698a45053520cc423 [9] http://code.qt.io/cgit/qt/qtwebengine.git/commit/?id=d4c621f6a6b87f2a86069fa393b9f7c4f9e7b9ad [10] http://code.qt.io/cgit/qt/qtwebengine.git/commit/?id=c11c2c8981e647c1eb2c6753ce77d436b92fff87 [11] https://blog.qt.io/blog/2017/10/06/qt-5-9-2-released/#comment-1200724 [12] https://blog.qt.io/blog/2017/10/06/qt-5-9-2-released/#comment-1200746 Signed-off-by: Peter Seiderer <ps.report@gmx.net> Tested-by: Joshua Henderson <joshua.henderson@microchip.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-10-17 22:28:03 +02:00
endif
qt5webkit: get source code from Qt5 unofficial builds Instead of messing with git we can get tarballs of obsolete but still existing Qt5 submodules as we used to but from a bit different location. It turned out Qt people still create packages for obsolete submodules for so-called "unofficial builds", see [1]. [1] https://wiki.qt.io/Qt-5-unofficial-builds Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> Cc: Yegor Yefremov <yegorslists@googlemail.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Peter Seiderer <ps.report@gmx.net> Cc: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net> Cc: Peter Korsgaard <peter@korsgaard.com> Cc: Julien Corjon <corjon.j@ecagroup.com> Cc: Gary Bisson <gary.bisson@boundarydevices.com> Cc: Jérôme Pouiller <jezz@sysmic.org> Reviewed-by: Julien Corjon <corjon.j@ecagroup.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-11-09 14:59:54 +01:00
QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz
package/qt5webkit: needs host-python The Qt5Webkit build system hard-codes calls to 'python', but only really supports python2. We fix that similarly as we did in nodejs, by adding a python->python2 symlink early in the PATH when configuring/building Qt5Webkit, and adding host-python in the dependency list. Fixes: http://autobuild.buildroot.org/results/ea4/ea4dd00ee585f9f9ea1927b8b5fd9035e6733420/ http://autobuild.buildroot.org/results/323/323ba220fae70d94c81bab9a348be844e90ace91/ http://autobuild.buildroot.org/results/6c2/6c20c9e222f94e6b70b97b87e1393dd16da2718c/ Also slightly reorganise the dependency list, now that it no longer fits on a single line. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-07-26 00:33:31 +02:00
QT5WEBKIT_DEPENDENCIES = \
host-bison host-flex host-gperf host-python host-ruby \
qt5webkit: select leveldb package and memenv This patch fixes the build issue reported by autobuilder [0]. /home/naourr/work/instance-2/output/build/qt5webkit-5.9.1/Source/WebCore//.obj/platform/leveldb/LevelDBDatabase.o: In function `WebCore::LevelDBDatabase::openInMemory(WebCore::LevelDBComparator const*)': LevelDBDatabase.cpp.text._ZN7WebCore15LevelDBDatabase12openInMemoryEPKNS_17LevelDBComparatorE+0x34): undefined reference to `leveldb::NewMemEnv(leveldb::Env*)' collect2: error: ld returned 1 exit status make[3]: *** [Makefile.api:97: ../lib/libQt5WebKit.so.5.9.1] Error 1 The issue happens when both packages leveldb and qt5webkit are enabled. QtWebKit builds its own copy of leveldb [1] (as a third-party) if the system does not provided it (i.e. buildroot). It builds it differently and this is the origin of that issue. Instead of using the Makefile provided by leveldb [2], QtWebKit uses qmake to build that library [3]. The missing symbol issue happens because the symbol leveldb::NewMemEnv is bundled in the static library libmemenv.a (aside libleveldb.so). This static library consists of this single symbol which is like an extra that is built but *NOT* shipped by default at installation in the staging directory. Unfortunatly, that symbol is required later by WebCore [4]. The copy built by QtWebKit is an all-in-one library including both libleveldb and libmemenv; thus QtWebKit links against libleveldb only. Also, the linker finds the buildroot's copy first (not the third-party): that explains why it is complaining about a missing symbol. That copy does not have the symbol leveldb::NewMemEnv. Fortunatly, QtWebKit provides a facility to link against the system leveldb package. The qmake flag WEBKIT_CONFIG+=use_system_leveldb tells Qt5WebKit to link against libleveldb *AND* libmemenv [5]. To fix that issue, this commit selects the package leveldb that now installs the libmemenv static library and its header. It ensures that QtWebKit has everything it needs to be built. It also sets the appropriate qmake configure flags to tell QtWebKit to use the leveldb copy built by buildroot instead of the bundled one. [0]: http://autobuild.buildroot.net/results/46033e82adf592c3b92c6d50cfaf45bd58beeaa4 [1]: https://github.com/qt/qtwebkit/tree/5.9/Source/ThirdParty/leveldb [2]: https://github.com/qt/qtwebkit/blob/5.9/Source/ThirdParty/leveldb/Makefile#L167-L169 [3]: https://github.com/qt/qtwebkit/blob/5.9/Source/ThirdParty/leveldb/Target.pri#L80 [4]: https://github.com/qt/qtwebkit/blob/5.9/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp#L185 [5]: https://github.com/qt/qtwebkit/blob/5.9/Source/WebCore/WebCore.pri#L254 [6]: https://github.com/google/leveldb/commit/739c25100e46576cdcdfff2d6f43f9f7008103c7 Signed-off-by: Gaël PORTAY <gael.portay@collabora.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2019-01-02 21:56:30 +01:00
leveldb qt5base sqlite
qt5webkit: restore package Although this package has been removed from the official release packages since Qt5.6.0, it is still available for users to build it from source. This is useful for platforms without GPU since its successor (QtWebEngine) requires OpenGL support. The package now matches the community-based meta-qt5 Yocto layer, using the exact same revision of the qtwebkit source from github: https://github.com/meta-qt5/meta-qt5/commit/e434995a Here is the project source tree: https://github.com/qtproject/qtwebkit All the patches have been pulled from Yocto as well. Since we are now using the source from the git repository, we need to create an empty .git/ folder to force the headers re-generation. https://github.com/meta-qt5/meta-qt5/blob/jethro/recipes-qt/qt5/qt5.inc#L33 Note that GPLv3 license option has been added with this release. Reviewed-by: Julien Corjon <corjon.j@ecagroup.com> Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com> [Thomas: fix license to be LGPLv2.1+, not LGPLv2+.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-04-13 15:40:35 +02:00
QT5WEBKIT_INSTALL_STAGING = YES
QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1
boot, package: use SPDX short identifier for BSD-2c We want to use SPDX identifier for license string as much as possible. SPDX short identifier for BSD-2c is BSD-2-Clause. This change is done using following command. find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/BSD-2c/BSD-2-Clause/g' Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-03-30 15:43:39 +02:00
QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause
qt5webkit: restore package Although this package has been removed from the official release packages since Qt5.6.0, it is still available for users to build it from source. This is useful for platforms without GPU since its successor (QtWebEngine) requires OpenGL support. The package now matches the community-based meta-qt5 Yocto layer, using the exact same revision of the qtwebkit source from github: https://github.com/meta-qt5/meta-qt5/commit/e434995a Here is the project source tree: https://github.com/qtproject/qtwebkit All the patches have been pulled from Yocto as well. Since we are now using the source from the git repository, we need to create an empty .git/ folder to force the headers re-generation. https://github.com/meta-qt5/meta-qt5/blob/jethro/recipes-qt/qt5/qt5.inc#L33 Note that GPLv3 license option has been added with this release. Reviewed-by: Julien Corjon <corjon.j@ecagroup.com> Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com> [Thomas: fix license to be LGPLv2.1+, not LGPLv2+.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-04-13 15:40:35 +02:00
# Source files contain references to LGPL_EXCEPTION.txt but it is not included
# in the archive.
QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21
ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y)
QT5WEBKIT_DEPENDENCIES += xlib_libXext xlib_libXrender
endif
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
QT5WEBKIT_DEPENDENCIES += qt5declarative
endif
package/qt5webkit: needs host-python The Qt5Webkit build system hard-codes calls to 'python', but only really supports python2. We fix that similarly as we did in nodejs, by adding a python->python2 symlink early in the PATH when configuring/building Qt5Webkit, and adding host-python in the dependency list. Fixes: http://autobuild.buildroot.org/results/ea4/ea4dd00ee585f9f9ea1927b8b5fd9035e6733420/ http://autobuild.buildroot.org/results/323/323ba220fae70d94c81bab9a348be844e90ace91/ http://autobuild.buildroot.org/results/6c2/6c20c9e222f94e6b70b97b87e1393dd16da2718c/ Also slightly reorganise the dependency list, now that it no longer fits on a single line. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-07-26 00:33:31 +02:00
# QtWebkit's build system uses python, but only supports python2. We work
# around this by forcing python2 early in the PATH, via a python->python2
# symlink.
qt5webkit: do not overwrite target python This commit fixes an issue introduced in commit ac16793eaaabfced0312420759e3a66cdaa1ea8e. This commit creates a link $(@D)/bin/python pointing to the host Python 2, and adds $(@D)/bin/ to the PATH. However, the QT5WEBKIT_INSTALL_TARGET_CMDS variable copies the contents of $(@D)/bin/ to the target filesystem, in order to install binaries produced by the qt5webkit build. By doing this, we overwrite the 'python' symbolic link on the target. In order to fix this, we simply create the 'python' symbolic link used to trick qt5webkit to use python2 on the host in the $(@D)/host-bin/ sub-directory. Signed-off-by: Johan Derycke <johan.derycke@barco.com> Tested-by: Yegor Yefremov <yegorslists@googlemail.com> [Thomas: rework commit log.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-10-19 16:35:24 +02:00
QT5WEBKIT_ENV = PATH=$(@D)/host-bin:$(BR_PATH)
package/qt5webkit: needs host-python The Qt5Webkit build system hard-codes calls to 'python', but only really supports python2. We fix that similarly as we did in nodejs, by adding a python->python2 symlink early in the PATH when configuring/building Qt5Webkit, and adding host-python in the dependency list. Fixes: http://autobuild.buildroot.org/results/ea4/ea4dd00ee585f9f9ea1927b8b5fd9035e6733420/ http://autobuild.buildroot.org/results/323/323ba220fae70d94c81bab9a348be844e90ace91/ http://autobuild.buildroot.org/results/6c2/6c20c9e222f94e6b70b97b87e1393dd16da2718c/ Also slightly reorganise the dependency list, now that it no longer fits on a single line. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-07-26 00:33:31 +02:00
define QT5WEBKIT_PYTHON2_SYMLINK
qt5webkit: do not overwrite target python This commit fixes an issue introduced in commit ac16793eaaabfced0312420759e3a66cdaa1ea8e. This commit creates a link $(@D)/bin/python pointing to the host Python 2, and adds $(@D)/bin/ to the PATH. However, the QT5WEBKIT_INSTALL_TARGET_CMDS variable copies the contents of $(@D)/bin/ to the target filesystem, in order to install binaries produced by the qt5webkit build. By doing this, we overwrite the 'python' symbolic link on the target. In order to fix this, we simply create the 'python' symbolic link used to trick qt5webkit to use python2 on the host in the $(@D)/host-bin/ sub-directory. Signed-off-by: Johan Derycke <johan.derycke@barco.com> Tested-by: Yegor Yefremov <yegorslists@googlemail.com> [Thomas: rework commit log.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-10-19 16:35:24 +02:00
mkdir -p $(@D)/host-bin
Globally replace $(HOST_DIR)/usr/bin with $(HOST_DIR)/bin Since things are no longer installed in $(HOST_DIR)/usr, the callers should also not refer to it. This is a mechanical change with git grep -l '$(HOST_DIR)/usr/bin' | xargs sed -i 's%$(HOST_DIR)/usr/bin%$(HOST_DIR)/bin%g' Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-07-05 13:14:19 +02:00
ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python
package/qt5webkit: needs host-python The Qt5Webkit build system hard-codes calls to 'python', but only really supports python2. We fix that similarly as we did in nodejs, by adding a python->python2 symlink early in the PATH when configuring/building Qt5Webkit, and adding host-python in the dependency list. Fixes: http://autobuild.buildroot.org/results/ea4/ea4dd00ee585f9f9ea1927b8b5fd9035e6733420/ http://autobuild.buildroot.org/results/323/323ba220fae70d94c81bab9a348be844e90ace91/ http://autobuild.buildroot.org/results/6c2/6c20c9e222f94e6b70b97b87e1393dd16da2718c/ Also slightly reorganise the dependency list, now that it no longer fits on a single line. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-07-26 00:33:31 +02:00
endef
QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK
qt5webkit: restore package Although this package has been removed from the official release packages since Qt5.6.0, it is still available for users to build it from source. This is useful for platforms without GPU since its successor (QtWebEngine) requires OpenGL support. The package now matches the community-based meta-qt5 Yocto layer, using the exact same revision of the qtwebkit source from github: https://github.com/meta-qt5/meta-qt5/commit/e434995a Here is the project source tree: https://github.com/qtproject/qtwebkit All the patches have been pulled from Yocto as well. Since we are now using the source from the git repository, we need to create an empty .git/ folder to force the headers re-generation. https://github.com/meta-qt5/meta-qt5/blob/jethro/recipes-qt/qt5/qt5.inc#L33 Note that GPLv3 license option has been added with this release. Reviewed-by: Julien Corjon <corjon.j@ecagroup.com> Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com> [Thomas: fix license to be LGPLv2.1+, not LGPLv2+.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-04-13 15:40:35 +02:00
define QT5WEBKIT_CONFIGURE_CMDS
qt5webkit: select leveldb package and memenv This patch fixes the build issue reported by autobuilder [0]. /home/naourr/work/instance-2/output/build/qt5webkit-5.9.1/Source/WebCore//.obj/platform/leveldb/LevelDBDatabase.o: In function `WebCore::LevelDBDatabase::openInMemory(WebCore::LevelDBComparator const*)': LevelDBDatabase.cpp.text._ZN7WebCore15LevelDBDatabase12openInMemoryEPKNS_17LevelDBComparatorE+0x34): undefined reference to `leveldb::NewMemEnv(leveldb::Env*)' collect2: error: ld returned 1 exit status make[3]: *** [Makefile.api:97: ../lib/libQt5WebKit.so.5.9.1] Error 1 The issue happens when both packages leveldb and qt5webkit are enabled. QtWebKit builds its own copy of leveldb [1] (as a third-party) if the system does not provided it (i.e. buildroot). It builds it differently and this is the origin of that issue. Instead of using the Makefile provided by leveldb [2], QtWebKit uses qmake to build that library [3]. The missing symbol issue happens because the symbol leveldb::NewMemEnv is bundled in the static library libmemenv.a (aside libleveldb.so). This static library consists of this single symbol which is like an extra that is built but *NOT* shipped by default at installation in the staging directory. Unfortunatly, that symbol is required later by WebCore [4]. The copy built by QtWebKit is an all-in-one library including both libleveldb and libmemenv; thus QtWebKit links against libleveldb only. Also, the linker finds the buildroot's copy first (not the third-party): that explains why it is complaining about a missing symbol. That copy does not have the symbol leveldb::NewMemEnv. Fortunatly, QtWebKit provides a facility to link against the system leveldb package. The qmake flag WEBKIT_CONFIG+=use_system_leveldb tells Qt5WebKit to link against libleveldb *AND* libmemenv [5]. To fix that issue, this commit selects the package leveldb that now installs the libmemenv static library and its header. It ensures that QtWebKit has everything it needs to be built. It also sets the appropriate qmake configure flags to tell QtWebKit to use the leveldb copy built by buildroot instead of the bundled one. [0]: http://autobuild.buildroot.net/results/46033e82adf592c3b92c6d50cfaf45bd58beeaa4 [1]: https://github.com/qt/qtwebkit/tree/5.9/Source/ThirdParty/leveldb [2]: https://github.com/qt/qtwebkit/blob/5.9/Source/ThirdParty/leveldb/Makefile#L167-L169 [3]: https://github.com/qt/qtwebkit/blob/5.9/Source/ThirdParty/leveldb/Target.pri#L80 [4]: https://github.com/qt/qtwebkit/blob/5.9/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp#L185 [5]: https://github.com/qt/qtwebkit/blob/5.9/Source/WebCore/WebCore.pri#L254 [6]: https://github.com/google/leveldb/commit/739c25100e46576cdcdfff2d6f43f9f7008103c7 Signed-off-by: Gaël PORTAY <gael.portay@collabora.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2019-01-02 21:56:30 +01:00
(cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(HOST_DIR)/bin/qmake WEBKIT_CONFIG+=use_system_leveldb)
qt5webkit: restore package Although this package has been removed from the official release packages since Qt5.6.0, it is still available for users to build it from source. This is useful for platforms without GPU since its successor (QtWebEngine) requires OpenGL support. The package now matches the community-based meta-qt5 Yocto layer, using the exact same revision of the qtwebkit source from github: https://github.com/meta-qt5/meta-qt5/commit/e434995a Here is the project source tree: https://github.com/qtproject/qtwebkit All the patches have been pulled from Yocto as well. Since we are now using the source from the git repository, we need to create an empty .git/ folder to force the headers re-generation. https://github.com/meta-qt5/meta-qt5/blob/jethro/recipes-qt/qt5/qt5.inc#L33 Note that GPLv3 license option has been added with this release. Reviewed-by: Julien Corjon <corjon.j@ecagroup.com> Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com> [Thomas: fix license to be LGPLv2.1+, not LGPLv2+.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-04-13 15:40:35 +02:00
endef
define QT5WEBKIT_BUILD_CMDS
package/qt5webkit: needs host-python The Qt5Webkit build system hard-codes calls to 'python', but only really supports python2. We fix that similarly as we did in nodejs, by adding a python->python2 symlink early in the PATH when configuring/building Qt5Webkit, and adding host-python in the dependency list. Fixes: http://autobuild.buildroot.org/results/ea4/ea4dd00ee585f9f9ea1927b8b5fd9035e6733420/ http://autobuild.buildroot.org/results/323/323ba220fae70d94c81bab9a348be844e90ace91/ http://autobuild.buildroot.org/results/6c2/6c20c9e222f94e6b70b97b87e1393dd16da2718c/ Also slightly reorganise the dependency list, now that it no longer fits on a single line. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-07-26 00:33:31 +02:00
$(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(MAKE) -C $(@D)
qt5webkit: restore package Although this package has been removed from the official release packages since Qt5.6.0, it is still available for users to build it from source. This is useful for platforms without GPU since its successor (QtWebEngine) requires OpenGL support. The package now matches the community-based meta-qt5 Yocto layer, using the exact same revision of the qtwebkit source from github: https://github.com/meta-qt5/meta-qt5/commit/e434995a Here is the project source tree: https://github.com/qtproject/qtwebkit All the patches have been pulled from Yocto as well. Since we are now using the source from the git repository, we need to create an empty .git/ folder to force the headers re-generation. https://github.com/meta-qt5/meta-qt5/blob/jethro/recipes-qt/qt5/qt5.inc#L33 Note that GPLv3 license option has been added with this release. Reviewed-by: Julien Corjon <corjon.j@ecagroup.com> Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com> [Thomas: fix license to be LGPLv2.1+, not LGPLv2+.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-04-13 15:40:35 +02:00
endef
define QT5WEBKIT_INSTALL_STAGING_CMDS
package/qt5webkit: needs host-python The Qt5Webkit build system hard-codes calls to 'python', but only really supports python2. We fix that similarly as we did in nodejs, by adding a python->python2 symlink early in the PATH when configuring/building Qt5Webkit, and adding host-python in the dependency list. Fixes: http://autobuild.buildroot.org/results/ea4/ea4dd00ee585f9f9ea1927b8b5fd9035e6733420/ http://autobuild.buildroot.org/results/323/323ba220fae70d94c81bab9a348be844e90ace91/ http://autobuild.buildroot.org/results/6c2/6c20c9e222f94e6b70b97b87e1393dd16da2718c/ Also slightly reorganise the dependency list, now that it no longer fits on a single line. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-07-26 00:33:31 +02:00
$(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(MAKE) -C $(@D) install
qt5webkit: restore package Although this package has been removed from the official release packages since Qt5.6.0, it is still available for users to build it from source. This is useful for platforms without GPU since its successor (QtWebEngine) requires OpenGL support. The package now matches the community-based meta-qt5 Yocto layer, using the exact same revision of the qtwebkit source from github: https://github.com/meta-qt5/meta-qt5/commit/e434995a Here is the project source tree: https://github.com/qtproject/qtwebkit All the patches have been pulled from Yocto as well. Since we are now using the source from the git repository, we need to create an empty .git/ folder to force the headers re-generation. https://github.com/meta-qt5/meta-qt5/blob/jethro/recipes-qt/qt5/qt5.inc#L33 Note that GPLv3 license option has been added with this release. Reviewed-by: Julien Corjon <corjon.j@ecagroup.com> Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com> [Thomas: fix license to be LGPLv2.1+, not LGPLv2+.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-04-13 15:40:35 +02:00
endef
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
define QT5WEBKIT_INSTALL_TARGET_QMLS
cp -dpfr $(STAGING_DIR)/usr/qml/QtWebKit $(TARGET_DIR)/usr/qml/
endef
endif
define QT5WEBKIT_INSTALL_TARGET_CMDS
cp -dpf $(STAGING_DIR)/usr/lib/libQt5WebKit*.so.* $(TARGET_DIR)/usr/lib
cp -dpf $(@D)/bin/* $(TARGET_DIR)/usr/bin/
$(QT5WEBKIT_INSTALL_TARGET_QMLS)
endef
$(eval $(generic-package))
Reference in New Issue Copy Permalink