diff options
Diffstat (limited to 'recipes-qt/qt5/qtlocation_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtlocation_git.bb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index e9f686cf..268bea1d 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -13,7 +13,9 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols" -SRC_URI += "file://0001-Make-mapbox-gl-build-configurable.patch" +SRC_URI += " \ + file://0001-Make-mapbox-gl-build-configurable.patch \ +" PACKAGECONFIG ??= "" # older geoclue 0.12.99 is needed @@ -24,9 +26,13 @@ PACKAGECONFIG[mapboxgl] = "" EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'mapboxgl', 'CONFIG+=mapboxgl', '', d)}" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" +# The same issue as in qtbase: +# http://errors.yoctoproject.org/Errors/Details/152640/ +LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" + SRC_URI += " \ ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ - " +" SRCREV_qtlocation = "d22e6d09f1607e694694d2ae5b2f447605a8782e" SRCREV_qtlocation-mapboxgl = "1c633072fcea7ad153ab6f8ec40dd72d83541ead" |