recipes: use new EXTRA_CONF_PACKAGECONFIG instead of EXTRA_OECONF
PATCH v2 1/2 recipes: use new EXTRA_CONF_PACKAGECONFIG instead of EXTRA_OECONF
* this fixes builds for DISTROs which include no-static-libraries.inc
* this change depends on oe-core change:
http://patchwork.openembedded.org/patch/116719/
which will probably be merged in Yocto 2.1, if you want to use latest meta-qt5 with older oe-core you need to append EXTRA_OECONF to EXTRA_CONF_PACKAGECONFIG
Signed-off-by Martin Jansa <[email protected]>
--- recipes-qt/qt5/nativesdk-qtbase_git.bb | 4 ++-- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 6 +++--- recipes-qt/qt5/qtbase_git.bb | 2 +- recipes-qt/qt5/qtconnectivity_git.bb | 2 +- recipes-qt/qt5/qtsystems_git.bb | 2 +- recipes-qt/qt5/qtwebengine_git.bb | 4 ++-- recipes-qt/qt5/qtwebkit_git.bb | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-)
recipes-qt/qt5/nativesdk-qtbase_git.bb +2 -2
@@ -82,7 +82,7 @@ QT_CONFIG_FLAGS += " \ -no-pch \ -no-rpath \ -pkg-config \ - ${EXTRA_OECONF} \ + ${EXTRA_CONF_PACKAGECONFIG} \ " # qtbase is exception, as these are used as install path for sysroots
@@ -201,7 +201,7 @@ do_configure() { -xplatform linux-oe-g++ \ ${QT_CONFIG_FLAGS} - bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} ${S} -o Makefile || die "Configuring qt with qmake failed. EXTRA_OECONF was ${EXTRA_OECONF}" + bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} ${S} -o Makefile || die "Configuring qt with qmake failed. EXTRA_CONF_PACKAGECONFIG was ${EXTRA_CONF_PACKAGECONFIG}" } do_install() {
recipes-qt/qt5/qt3d_git.bb +1 -1
@@ -20,7 +20,7 @@ PACKAGECONFIG_class-native ??= "tools-only" PACKAGECONFIG_class-nativesdk ??= "tools-only" PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" -EXTRA_QMAKEVARS_PRE += "${EXTRA_OECONF}" +EXTRA_QMAKEVARS_PRE += "${EXTRA_CONF_PACKAGECONFIG}" FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/*/*/*.bez \
recipes-qt/qt5/qtbase-native_git.bb +3 -3
@@ -40,7 +40,7 @@ do_generate_qt_config_file() { : } -EXTRA_OECONF = " \ +EXTRA_CONF_PACKAGECONFIG = " \ -prefix ${prefix} \ -sysroot ${STAGING_DIR_NATIVE} \ -no-gcc-sysroot \
@@ -90,8 +90,8 @@ export OE_QMAKE_AR export OE_QMAKE_STRIP do_configure_prepend() { - MAKEFLAGS="${PARALLEL_MAKE}" ${S}/configure -opensource -confirm-license ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" - bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} ${S} -o Makefile || die "Configuring qt with qmake failed. EXTRA_OECONF was ${EXTRA_OECONF}" + MAKEFLAGS="${PARALLEL_MAKE}" ${S}/configure -opensource -confirm-license ${EXTRA_CONF_PACKAGECONFIG} || die "Configuring qt failed. EXTRA_CONF_PACKAGECONFIG was ${EXTRA_CONF_PACKAGECONFIG}" + bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} ${S} -o Makefile || die "Configuring qt with qmake failed. EXTRA_CONF_PACKAGECONFIG was ${EXTRA_CONF_PACKAGECONFIG}" } do_install() {
recipes-qt/qt5/qtbase_git.bb +1 -1
@@ -135,7 +135,7 @@ QT_CONFIG_FLAGS += " \ -no-pch \ -no-rpath \ -pkg-config \ - ${EXTRA_OECONF} \ + ${EXTRA_CONF_PACKAGECONFIG} \ " do_generate_qt_config_file_append() {
recipes-qt/qt5/qtconnectivity_git.bb +1 -1
@@ -18,7 +18,7 @@ inherit bluetooth PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}" PACKAGECONFIG[bluez] = "CONFIG+=OE_BLUEZ_ENABLED,,${BLUEZ}" -EXTRA_QMAKEVARS_PRE += "${EXTRA_OECONF}" +EXTRA_QMAKEVARS_PRE += "${EXTRA_CONF_PACKAGECONFIG}" do_configure_prepend() { # disable bluez test if it isn't enabled by PACKAGECONFIG
recipes-qt/qt5/qtsystems_git.bb +1 -1
@@ -16,7 +16,7 @@ inherit bluetooth PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}" PACKAGECONFIG[bluez] = "CONFIG+=OE_BLUEZ_ENABLED,,${BLUEZ}" -EXTRA_QMAKEVARS_PRE += "${EXTRA_OECONF}" +EXTRA_QMAKEVARS_PRE += "${EXTRA_CONF_PACKAGECONFIG}" do_configure_prepend() { # disable bluez test if it isn't enabled by PACKAGECONFIG
recipes-qt/qt5/qtwebengine_git.bb +2 -2
@@ -40,7 +40,7 @@ PACKAGECONFIG[libxslt] = "WEBENGINE_CONFIG+=use_system_libxslt,,libxslt" PACKAGECONFIG[speex] = "WEBENGINE_CONFIG+=use_system_speex,,speex" PACKAGECONFIG[vpx] = "WEBENGINE_CONFIG+=use_system_vpx,,libvpx" -EXTRA_QMAKEVARS_PRE += "${EXTRA_OECONF}" +EXTRA_QMAKEVARS_PRE += "${EXTRA_CONF_PACKAGECONFIG}" COMPATIBLE_MACHINE = "(-)" COMPATIBLE_MACHINE_x86 = "(.*)"
@@ -74,7 +74,7 @@ do_configure() { export CC_host="gcc" export CXX_host="g++" export QMAKE_MAKE_ARGS="${EXTRA_OEMAKE}" - export QMAKE_CACHE_EVAL="${EXTRA_OECONF}" + export QMAKE_CACHE_EVAL="${EXTRA_CONF_PACKAGECONFIG}" # Disable autodetection from sysroot: sed -i 's/packagesExist([^)]*vpx[^)]*):/false:/g; s/config_srtp:/false:/g; s/config_snappy:/false:/g; s/packagesExist(nss):/false:/g; s/packagesExist(minizip, zlib):/false:/g; s/packagesExist(libwebp,libwebpdemux):/false:/g; s/packagesExist(libxml-2.0,libxslt):/false:/g; s/^ *packagesExist($$package):/false:/g' ${S}/tools/qmake/mkspecs/features/configure.prf
recipes-qt/qt5/qtwebkit_git.bb +1 -1
@@ -35,7 +35,7 @@ PACKAGECONFIG[qtwebchannel] = "OE_QTWEBCHANNEL_ENABLED,,qtwebchannel" PACKAGECONFIG[libwebp] = "OE_LIBWEBP_ENABLED,,libwebp" do_configure_prepend() { - export QMAKE_CACHE_EVAL="CONFIG+=${EXTRA_OECONF}" + export QMAKE_CACHE_EVAL="CONFIG+=${EXTRA_CONF_PACKAGECONFIG}" # disable gstreamer-1.0 test if it isn't enabled by PACKAGECONFIG sed -e 's/\s\(packagesExist(".*\<gstreamer-1.0\>.*")\)/ OE_GSTREAMER_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf # disable gstreamer-0.10 test if it isn't enabled by PACKAGECONFIG
Signature · 1 line
2.7.2
PATCH v2 2/2 qmake5_base: use remove-libtool bbclass
* this requires latest oe-core (Yocto 2.1), if you want to use latest meta-qt5 with older oe-core, you need to backport this bbclass and more importantly don't forget to provide EXTRA_CONF_PACKAGECONFIG
Signed-off-by Martin Jansa <[email protected]>
--- classes/qmake5_base.bbclass | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
classes/qmake5_base.bbclass +1 -3
@@ -47,7 +47,7 @@ OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner" # this one needs to be exported, because qmake reads it from shell env export QT_CONF_PATH = "${WORKDIR}/qt.conf" -inherit qmake5_paths +inherit qmake5_paths remove-libtool do_generate_qt_config_file() { cat > ${QT_CONF_PATH} <<EOF
@@ -168,7 +168,6 @@ qmake5_base_nativesdk_do_install() { find . -name "Makefile*" | xargs -r sed -i "s,(INSTALL_ROOT)${STAGING_DIR_HOST},(INSTALL_ROOT),g" oe_runmake install INSTALL_ROOT=${D} - find "${D}" -ignore_readdir_race -name "*.la" -delete } qmake5_base_do_install() {
@@ -176,7 +175,6 @@ qmake5_base_do_install() { find . -name "Makefile*" | xargs -r sed -i "s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g" oe_runmake install INSTALL_ROOT=${D} - find "${D}" -ignore_readdir_race -name "*.la" -delete # everything except HostData and HostBinaries is prefixed with sysroot value, # but we cannot remove sysroot override, because that's useful for pkg-config etc
Signature · 1 line
2.7.2