d4b494b71e
This commit fixes an issue introduced in commit
ac16793eaa. 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>
79 lines
2.7 KiB
Makefile
79 lines
2.7 KiB
Makefile
################################################################################
|
|
#
|
|
# qt5webkit
|
|
#
|
|
################################################################################
|
|
|
|
QT5WEBKIT_VERSION = b35917bcb44d7f200af0f4ac68a126fa0aa8d93d
|
|
# Using GitHub since it supports downloading tarballs from random commits.
|
|
# The http://code.qt.io/cgit/qt/qtwebkit.git/ repo doesn't allow to do so.
|
|
QT5WEBKIT_SITE = $(call github,qtproject,qtwebkit,$(QT5WEBKIT_VERSION))
|
|
QT5WEBKIT_DEPENDENCIES = \
|
|
host-bison host-flex host-gperf host-python host-ruby \
|
|
qt5base sqlite
|
|
QT5WEBKIT_INSTALL_STAGING = YES
|
|
|
|
QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1
|
|
|
|
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
|
|
QT5WEBKIT_LICENSE = LGPLv2.1+, BSD-3c, BSD-2c
|
|
# Source files contain references to LGPL_EXCEPTION.txt but it is not included
|
|
# in the archive.
|
|
QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21
|
|
else
|
|
QT5WEBKIT_LICENSE = LGPLv2.1+ (WebCore), Commercial license
|
|
QT5WEBKIT_REDISTRIBUTE = NO
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y)
|
|
QT5WEBKIT_DEPENDENCIES += xlib_libXext xlib_libXrender
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
|
|
QT5WEBKIT_DEPENDENCIES += qt5declarative
|
|
endif
|
|
|
|
# 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_ENV = PATH=$(@D)/host-bin:$(BR_PATH)
|
|
define QT5WEBKIT_PYTHON2_SYMLINK
|
|
mkdir -p $(@D)/host-bin
|
|
ln -sf $(HOST_DIR)/usr/bin/python2 $(@D)/host-bin/python
|
|
endef
|
|
QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK
|
|
|
|
# Since we get the source from git, generated header files are not included.
|
|
# qmake detects that header file generation (using the syncqt tool) must be
|
|
# done based on the existence of a .git directory (cfr. the git_build config
|
|
# option which is set in qt_build_paths.prf).
|
|
# So, to make sure that qmake detects that header files must be generated,
|
|
# create an empty .git directory.
|
|
define QT5WEBKIT_CONFIGURE_CMDS
|
|
mkdir -p $(@D)/.git
|
|
(cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(HOST_DIR)/usr/bin/qmake)
|
|
endef
|
|
|
|
define QT5WEBKIT_BUILD_CMDS
|
|
$(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(MAKE) -C $(@D)
|
|
endef
|
|
|
|
define QT5WEBKIT_INSTALL_STAGING_CMDS
|
|
$(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(MAKE) -C $(@D) install
|
|
$(QT5_LA_PRL_FILES_FIXUP)
|
|
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))
|